Skip to content
This repository was archived by the owner on Sep 8, 2022. It is now read-only.

[MIRROR] Exempts all medical staff from Doctor's Delight hunger drain by adding a new medical_metabolism mind trait. #1026

Open
SinguloBot wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[MIRROR] Exempts all medical staff from Doctor's Delight hunger drain by adding a new medical_metabolism mind trait. #1026

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
526245f
main (#7562)
CydiaLamiales Sep 4, 2022
48e304f
Exempts all medical staff from Doctor's Delight hunger drain by addin…
SinguloBot Sep 4, 2022
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
1 change: 1 addition & 0 deletions code/__DEFINES/traits.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
#define TRAIT_MAGIC_CHOKE "magic_choke"
#define TRAIT_SOOTHED_THROAT "soothed-throat"
#define TRAIT_LAW_ENFORCEMENT_METABOLISM "law-enforcement-metabolism"
#define TRAIT_MEDICAL_METABOLISM "medical-metabolism"
#define TRAIT_ALWAYS_CLEAN "always-clean"
#define TRAIT_BOOZE_SLIDER "booze-slider"
#define TRAIT_QUICK_CARRY "quick-carry"
Expand Down
1 change: 1 addition & 0 deletions code/_globalvars/traits.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
"TRAIT_MAGIC_CHOKE" = TRAIT_MAGIC_CHOKE,
"TRAIT_SOOTHED_THROAT" = TRAIT_SOOTHED_THROAT,
"TRAIT_LAW_ENFORCEMENT_METABOLISM" = TRAIT_LAW_ENFORCEMENT_METABOLISM,
"TRAIT_MEDICAL_METABOLISM" = TRAIT_MEDICAL_METABOLISM,
"TRAIT_ALWAYS_CLEAN" = TRAIT_ALWAYS_CLEAN,
"TRAIT_BOOZE_SLIDER" = TRAIT_BOOZE_SLIDER,
"TRAIT_QUICK_CARRY" = TRAIT_QUICK_CARRY,
Expand Down
1 change: 1 addition & 0 deletions code/modules/jobs/job_types/brigphys.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
minimal_access = list(ACCESS_SEC_DOORS, ACCESS_COURT, ACCESS_MAINT_TUNNELS, ACCESS_MORGUE, ACCESS_MEDICAL, ACCESS_BRIGPHYS)
paycheck = PAYCHECK_MEDIUM
paycheck_department = ACCOUNT_MED
mind_traits = list(TRAIT_MEDICAL_METABOLISM)

display_order = JOB_DISPLAY_ORDER_BRIG_PHYS
departments = DEPARTMENT_MEDICAL | DEPARTMENT_SECURITY
Expand Down
1 change: 1 addition & 0 deletions code/modules/jobs/job_types/chemist.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
minimal_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_CHEMISTRY, ACCESS_MECH_MEDICAL, ACCESS_MINERAL_STOREROOM)
paycheck = PAYCHECK_MEDIUM
paycheck_department = ACCOUNT_MED
mind_traits = list(TRAIT_MEDICAL_METABOLISM)

display_order = JOB_DISPLAY_ORDER_CHEMIST
departments = DEPARTMENT_MEDICAL
Expand Down
1 change: 1 addition & 0 deletions code/modules/jobs/job_types/chief_medical_officer.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
ACCESS_KEYCARD_AUTH, ACCESS_SEC_DOORS, ACCESS_MAINT_TUNNELS, ACCESS_BRIGPHYS, ACCESS_EVA, ACCESS_EXTERNAL_AIRLOCKS)
paycheck = PAYCHECK_COMMAND
paycheck_department = ACCOUNT_MED
mind_traits = list(TRAIT_MEDICAL_METABOLISM)

display_order = JOB_DISPLAY_ORDER_CHIEF_MEDICAL_OFFICER
departments = DEPARTMENT_MEDICAL | DEPARTMENT_COMMAND
Expand Down
1 change: 1 addition & 0 deletions code/modules/jobs/job_types/emt.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
ACCESS_EVA, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_AUX_BASE)
paycheck = PAYCHECK_MEDIUM
paycheck_department = ACCOUNT_MED
mind_traits = list(TRAIT_MEDICAL_METABOLISM)

display_order = JOB_DISPLAY_ORDER_MEDICAL_DOCTOR
departments = DEPARTMENT_MEDICAL
Expand Down
1 change: 1 addition & 0 deletions code/modules/jobs/job_types/geneticist.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
minimal_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_GENETICS, ACCESS_CLONING, ACCESS_MECH_MEDICAL, ACCESS_RESEARCH, ACCESS_MINERAL_STOREROOM)
paycheck = PAYCHECK_MEDIUM
paycheck_department = ACCOUNT_MED
mind_traits = list(TRAIT_MEDICAL_METABOLISM)

display_order = JOB_DISPLAY_ORDER_GENETICIST
departments = DEPARTMENT_MEDICAL
Expand Down
10 changes: 10 additions & 0 deletions code/modules/jobs/job_types/gimmick.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,9 +125,19 @@
access = list(ACCESS_MAINT_TUNNELS, ACCESS_MEDICAL)
minimal_access = list(ACCESS_MAINT_TUNNELS, ACCESS_MEDICAL)
paycheck = PAYCHECK_EASY
<<<<<<< HEAD
gimmick = TRUE
chat_color = "#a2dfdc"
departments = DEPARTMENT_MEDICAL
=======
departments = DEPARTMENT_BITFLAG_MEDICAL
mind_traits = list(TRAIT_MEDICAL_METABOLISM)

paycheck_department = ACCOUNT_MED
rpg_title = "Enchanter"

mind_traits = list(TRAIT_MADNESS_IMMUNE)
>>>>>>> cd2fb95722... main (#7562)

species_outfits = list(
SPECIES_PLASMAMAN = /datum/outfit/plasmaman
Expand Down
1 change: 1 addition & 0 deletions code/modules/jobs/job_types/medical_doctor.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
minimal_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_CLONING, ACCESS_MECH_MEDICAL, ACCESS_MINERAL_STOREROOM, ACCESS_MAINT_TUNNELS)
paycheck = PAYCHECK_MEDIUM
paycheck_department = ACCOUNT_MED
mind_traits = list(TRAIT_MEDICAL_METABOLISM)

display_order = JOB_DISPLAY_ORDER_MEDICAL_DOCTOR
departments = DEPARTMENT_MEDICAL
Expand Down
1 change: 1 addition & 0 deletions code/modules/jobs/job_types/virologist.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
minimal_access = list(ACCESS_MEDICAL, ACCESS_VIROLOGY, ACCESS_MECH_MEDICAL, ACCESS_MINERAL_STOREROOM, ACCESS_MAINT_TUNNELS)
paycheck = PAYCHECK_MEDIUM
paycheck_department = ACCOUNT_MED
mind_traits = list(TRAIT_MEDICAL_METABOLISM)

display_order = JOB_DISPLAY_ORDER_VIROLOGIST
departments = DEPARTMENT_MEDICAL
Expand Down
4 changes: 4 additions & 0 deletions code/modules/reagents/chemistry/reagents/drink_reagents.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -677,7 +677,11 @@
M.adjustToxLoss(-0.5, 0)
M.adjustOxyLoss(-0.5, 0)
if(M.nutrition && (M.nutrition - 2 > 0))
<<<<<<< HEAD
if(M.mind?.assigned_role != "Medical Doctor") //Drains the nutrition of the holder. Not medical doctors though, since it's the Doctor's Delight!
=======
if(M.mind && !HAS_TRAIT(M.mind, TRAIT_MEDICAL_METABOLISM)) //Drains the nutrition of the holder. Not medical staff though, since it's the Doctor's Delight!
>>>>>>> cd2fb95722... main (#7562)
M.adjust_nutrition(-2)
..()
. = 1
Expand Down