[MIRROR] Adds new station traits that gives departments / everyone death rattle implants (#3683)

* Adds new station traits that gives departments / everyone death rattle implants * Update jobs.dm Co-authored-by: Qustinnus <Floydje123@hotmail.com> Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2026-07-12 00:27:31 +01:00 · 2021-02-28 20:40:35 +01:00
parent 6fac8f066e
commit b7da8c2269
40 changed files with 149 additions and 1 deletions
@@ -68,6 +68,9 @@

 	var/bounty_types = CIV_JOB_BASIC

+	///Bitfield of departments this job belongs wit
+	var/departments = NONE
+
 	/// Should this job be allowed to be picked for the bureaucratic error event?
 	var/allow_bureaucratic_error = TRUE

@@ -13,6 +13,7 @@
 	exp_type_department = EXP_TYPE_SILICON
 	display_order = JOB_DISPLAY_ORDER_AI
 	allow_bureaucratic_error = FALSE
+	departments = DEPARTMENT_SILICON
 	var/do_special_check = TRUE

 /datum/job/ai/equip(mob/living/carbon/human/H, visualsOnly, announce, latejoin, datum/outfit/outfit_override, client/preference_source = null)
@@ -13,6 +13,7 @@ Assistant
 	outfit = /datum/outfit/job/assistant
 	antag_rep = 7
 	paycheck = PAYCHECK_ASSISTANT // Get a job. Job reassignment changes your paycheck now. Get over it.
+	departments = DEPARTMENT_SERVICE

 	liver_traits = list(TRAIT_GREYTIDE_METABOLISM)

@@ -24,6 +24,7 @@

 	display_order = JOB_DISPLAY_ORDER_ATMOSPHERIC_TECHNICIAN
 	bounty_types = CIV_JOB_ENG
+	departments = DEPARTMENT_ENGINEERING

 /datum/outfit/job/atmos
 	name = "Atmospheric Technician"
@@ -15,6 +15,7 @@
 	paycheck_department = ACCOUNT_SRV
 	display_order = JOB_DISPLAY_ORDER_BARTENDER
 	bounty_types = CIV_JOB_DRINK
+	departments = DEPARTMENT_SERVICE

 /datum/outfit/job/bartender
 	name = "Bartender"
@@ -15,6 +15,7 @@
 	paycheck_department = ACCOUNT_SRV
 	display_order = JOB_DISPLAY_ORDER_BOTANIST
 	bounty_types = CIV_JOB_GROW
+	departments = DEPARTMENT_SERVICE

 /datum/outfit/job/botanist
 	name = "Botanist"
@@ -23,6 +23,7 @@
 	liver_traits = list(TRAIT_ROYAL_METABOLISM)

 	display_order = JOB_DISPLAY_ORDER_CAPTAIN
+	departments = DEPARTMENT_COMMAND

 /datum/job/captain/get_access()
 	return get_all_accesses()
@@ -17,6 +17,7 @@
 	paycheck_department = ACCOUNT_CAR
 	display_order = JOB_DISPLAY_ORDER_CARGO_TECHNICIAN
 	bounty_types = CIV_JOB_RANDOM
+	departments = DEPARTMENT_CARGO

 /datum/outfit/job/cargo_tech
 	name = "Cargo Technician"
@@ -15,6 +15,7 @@
 	paycheck_department = ACCOUNT_SRV

 	display_order = JOB_DISPLAY_ORDER_CHAPLAIN
+	departments = DEPARTMENT_SERVICE


 /datum/job/chaplain/after_spawn(mob/living/H, mob/M)
@@ -20,6 +20,7 @@

 	display_order = JOB_DISPLAY_ORDER_CHEMIST
 	bounty_types = CIV_JOB_CHEM
+	departments = DEPARTMENT_MEDICAL

 /datum/outfit/job/chemist
 	name = "Chemist"
@@ -15,6 +15,7 @@
 	exp_type_department = EXP_TYPE_ENGINEERING

 	outfit = /datum/outfit/job/ce
+	departments = DEPARTMENT_ENGINEERING | DEPARTMENT_COMMAND

 	access = list(ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_MAINT_TUNNELS,
 					ACCESS_EXTERNAL_AIRLOCKS, ACCESS_ATMOSPHERICS, ACCESS_EVA, ACCESS_AUX_BASE,
@@ -15,6 +15,7 @@
 	exp_type_department = EXP_TYPE_MEDICAL

 	outfit = /datum/outfit/job/cmo
+	departments = DEPARTMENT_MEDICAL | DEPARTMENT_COMMAND

 	access = list(ACCESS_MEDICAL, ACCESS_PSYCHOLOGY, ACCESS_MORGUE, ACCESS_PHARMACY, ACCESS_HEADS, ACCESS_MINERAL_STOREROOM,
 			ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_CMO, ACCESS_SURGERY, ACCESS_RC_ANNOUNCE, ACCESS_MECH_MEDICAL,
@@ -17,6 +17,7 @@
 	liver_traits = list(TRAIT_COMEDY_METABOLISM)

 	display_order = JOB_DISPLAY_ORDER_CLOWN
+	departments = DEPARTMENT_SERVICE


 /datum/job/clown/after_spawn(mob/living/carbon/human/H, mob/M)
@@ -19,6 +19,7 @@

 	display_order = JOB_DISPLAY_ORDER_COOK
 	bounty_types = CIV_JOB_CHEF
+	departments = DEPARTMENT_SERVICE

 /datum/outfit/job/cook
 	name = "Cook"
@@ -15,6 +15,7 @@
 	paycheck_department = ACCOUNT_SRV

 	display_order = JOB_DISPLAY_ORDER_CURATOR
+	departments = DEPARTMENT_SERVICE

 /datum/outfit/job/curator
 	name = "Curator"
@@ -11,6 +11,7 @@
 	exp_type = EXP_TYPE_CREW

 	display_order = JOB_DISPLAY_ORDER_CYBORG
+	departments = DEPARTMENT_SILICON

 /datum/job/cyborg/equip(mob/living/carbon/human/H, visualsOnly = FALSE, announce = TRUE, latejoin = FALSE, datum/outfit/outfit_override = null, client/preference_source = null)
 	if(visualsOnly)
@@ -12,6 +12,7 @@
 	exp_type = EXP_TYPE_CREW

 	outfit = /datum/outfit/job/detective
+	departments = DEPARTMENT_SECURITY

 	access = list(ACCESS_SEC_DOORS, ACCESS_FORENSICS_LOCKERS, ACCESS_MORGUE, ACCESS_MAINT_TUNNELS, ACCESS_MECH_SECURITY, ACCESS_COURT, ACCESS_BRIG, ACCESS_WEAPONS, ACCESS_MINERAL_STOREROOM)
 	minimal_access = list(ACCESS_SEC_DOORS, ACCESS_FORENSICS_LOCKERS, ACCESS_MORGUE, ACCESS_MAINT_TUNNELS, ACCESS_MECH_SECURITY, ACCESS_COURT, ACCESS_BRIG, ACCESS_WEAPONS, ACCESS_MINERAL_STOREROOM)
@@ -10,6 +10,7 @@
 	exp_requirements = 60

 	outfit = /datum/outfit/job/geneticist
+	departments = DEPARTMENT_MEDICAL

 	access = list(ACCESS_MORGUE, ACCESS_GENETICS, ACCESS_MECH_SCIENCE, ACCESS_RESEARCH, ACCESS_XENOBIOLOGY, ACCESS_ROBOTICS, ACCESS_MINERAL_STOREROOM, ACCESS_TECH_STORAGE, ACCESS_RND)
 	minimal_access = list(ACCESS_MORGUE, ACCESS_GENETICS, ACCESS_MECH_SCIENCE, ACCESS_RESEARCH, ACCESS_MINERAL_STOREROOM, ACCESS_RND)
@@ -16,6 +16,7 @@
 	exp_type_department = EXP_TYPE_SERVICE

 	outfit = /datum/outfit/job/hop
+	departments = DEPARTMENT_COMMAND | DEPARTMENT_SERVICE

 	//SKYRAT EDIT CHANGE BEGIN
 	/*
@@ -15,6 +15,7 @@
 	exp_type_department = EXP_TYPE_SECURITY

 	outfit = /datum/outfit/job/hos
+	departments = DEPARTMENT_SECURITY | DEPARTMENT_COMMAND

 	mind_traits = list(TRAIT_DONUT_LOVER)
 	liver_traits = list(TRAIT_LAW_ENFORCEMENT_METABOLISM, TRAIT_ROYAL_METABOLISM)
@@ -15,6 +15,7 @@
 	paycheck_department = ACCOUNT_SRV

 	display_order = JOB_DISPLAY_ORDER_JANITOR
+	departments = DEPARTMENT_SERVICE

 /datum/outfit/job/janitor
 	name = "Janitor"
@@ -19,6 +19,7 @@
 	liver_traits = list(TRAIT_LAW_ENFORCEMENT_METABOLISM)

 	display_order = JOB_DISPLAY_ORDER_LAWYER
+	departments = DEPARTMENT_SERVICE

 /datum/outfit/job/lawyer
 	name = "Lawyer"
@@ -18,6 +18,7 @@

 	display_order = JOB_DISPLAY_ORDER_MEDICAL_DOCTOR
 	bounty_types = CIV_JOB_MED
+	departments = DEPARTMENT_MEDICAL

 /datum/outfit/job/doctor
 	name = "Medical Doctor"
@@ -15,6 +15,7 @@
 	paycheck_department = ACCOUNT_SRV

 	display_order = JOB_DISPLAY_ORDER_MIME
+	departments = DEPARTMENT_SERVICE

 /datum/job/mime/after_spawn(mob/living/carbon/human/H, mob/M)
 	H.apply_pref_name("mime", M.client)
@@ -20,6 +20,7 @@

 	display_order = JOB_DISPLAY_ORDER_PARAMEDIC
 	bounty_types = CIV_JOB_MED
+	departments = DEPARTMENT_MEDICAL

 /datum/outfit/job/paramedic
 	name = "Paramedic"
@@ -17,6 +17,7 @@
 	liver_traits = list(TRAIT_MEDICAL_METABOLISM)

 	display_order = JOB_DISPLAY_ORDER_PSYCHOLOGIST
+	departments = DEPARTMENT_SERVICE

 /datum/outfit/job/psychologist
 	name = "Psychologist"
@@ -28,6 +28,7 @@

 	display_order = JOB_DISPLAY_ORDER_QUARTERMASTER
 	bounty_types = CIV_JOB_RANDOM
+	departments = DEPARTMENT_CARGO

 /datum/outfit/job/quartermaster
 	name = "Quartermaster"
@@ -15,6 +15,7 @@
 	exp_type = EXP_TYPE_CREW

 	outfit = /datum/outfit/job/rd
+	departments = DEPARTMENT_SCIENCE | DEPARTMENT_COMMAND

 	access = list(ACCESS_RD, ACCESS_HEADS, ACCESS_RND, ACCESS_GENETICS, ACCESS_MORGUE,
 					ACCESS_TOXINS, ACCESS_TELEPORTER, ACCESS_SEC_DOORS, ACCESS_MECH_SCIENCE,
@@ -11,6 +11,7 @@
 	bounty_types = CIV_JOB_ROBO

 	outfit = /datum/outfit/job/roboticist
+	departments = DEPARTMENT_SCIENCE

 	access = list(ACCESS_ROBOTICS, ACCESS_RND, ACCESS_TOXINS, ACCESS_TOXINS_STORAGE, ACCESS_TECH_STORAGE, ACCESS_MORGUE, ACCESS_MECH_SCIENCE,
 					ACCESS_RESEARCH, ACCESS_MINERAL_STOREROOM, ACCESS_XENOBIOLOGY, ACCESS_GENETICS, ACCESS_AUX_BASE)
@@ -21,6 +21,7 @@

 	display_order = JOB_DISPLAY_ORDER_SCIENTIST
 	bounty_types = CIV_JOB_SCI
+	departments = DEPARTMENT_SCIENCE

 /datum/outfit/job/scientist
 	name = "Scientist"
@@ -23,6 +23,7 @@

 	display_order = JOB_DISPLAY_ORDER_SECURITY_OFFICER
 	bounty_types = CIV_JOB_SEC
+	departments = DEPARTMENT_SECURITY

 /datum/job/officer/get_access()
 	var/list/L = list()
@@ -16,6 +16,7 @@

 	display_order = JOB_DISPLAY_ORDER_SHAFT_MINER
 	bounty_types = CIV_JOB_MINE
+	departments = DEPARTMENT_CARGO

 /datum/outfit/job/miner
 	name = "Shaft Miner"
@@ -22,6 +22,7 @@

 	display_order = JOB_DISPLAY_ORDER_STATION_ENGINEER
 	bounty_types = CIV_JOB_ENG
+	departments = DEPARTMENT_ENGINEERING

 /datum/outfit/job/engineer
 	name = "Station Engineer"
@@ -20,6 +20,7 @@

 	display_order = JOB_DISPLAY_ORDER_VIROLOGIST
 	bounty_types = CIV_JOB_VIRO
+	departments = DEPARTMENT_MEDICAL

 /datum/outfit/job/virologist
 	name = "Virologist"
@@ -23,6 +23,7 @@

 	display_order = JOB_DISPLAY_ORDER_WARDEN
 	bounty_types = CIV_JOB_SEC
+	departments = DEPARTMENT_SECURITY

 /datum/job/warden/get_access()
 	var/list/L = list()