From bd72cf382d808252237bae34f0d8f101cc5aee82 Mon Sep 17 00:00:00 2001 From: DragonTrance Date: Wed, 8 Jun 2022 18:46:38 -0400 Subject: [PATCH] adds base pay multipliers for all jobs --- code/__DEFINES/economy.dm | 6 +++--- code/modules/jobs/job_types/assistant.dm | 1 + code/modules/jobs/job_types/captain.dm | 2 ++ code/modules/jobs/job_types/cargo_service.dm | 6 ++++++ code/modules/jobs/job_types/civilian.dm | 4 ++++ code/modules/jobs/job_types/civilian_chaplain.dm | 1 + code/modules/jobs/job_types/engineering.dm | 2 ++ code/modules/jobs/job_types/job.dm | 2 +- code/modules/jobs/job_types/medical.dm | 3 +++ code/modules/jobs/job_types/science.dm | 2 ++ code/modules/jobs/job_types/security.dm | 2 ++ 11 files changed, 27 insertions(+), 4 deletions(-) diff --git a/code/__DEFINES/economy.dm b/code/__DEFINES/economy.dm index c00b4d593..d07ef1193 100644 --- a/code/__DEFINES/economy.dm +++ b/code/__DEFINES/economy.dm @@ -1,8 +1,8 @@ #define BASEPAY_ASSISTANT 1 -#define BASEPAY_ROOKIE 1 +#define BASEPAY_ROOKIE 1.05 //rookies, chaplain, clown, curator, lawyer, etc that dont take much effort to be good in #define BASEPAY_DEFAULT 1.1 -#define BASEPAY_COMMAND 1.25 -#define BASEPAY_CAPTAIN 1.5 +#define BASEPAY_COMMAND 1.3 +#define BASEPAY_CAPTAIN 1.65 #define PRICE_BASE (FLOOR(BASEPAY_ASSISTANT * 16, 1)) diff --git a/code/modules/jobs/job_types/assistant.dm b/code/modules/jobs/job_types/assistant.dm index 3cd6fc77a..82e65a84a 100644 --- a/code/modules/jobs/job_types/assistant.dm +++ b/code/modules/jobs/job_types/assistant.dm @@ -14,6 +14,7 @@ Assistant minimal_access = list() //See /datum/job/assistant/get_access() outfit = /datum/outfit/job/assistant antag_rep = 7 + base_paycheck_multiplier = BASEPAY_ASSISTANT /datum/job/assistant/get_access() diff --git a/code/modules/jobs/job_types/captain.dm b/code/modules/jobs/job_types/captain.dm index f568378c1..19fde21df 100644 --- a/code/modules/jobs/job_types/captain.dm +++ b/code/modules/jobs/job_types/captain.dm @@ -16,6 +16,7 @@ Captain exp_requirements = 3000 exp_type = EXP_TYPE_COMMAND exp_type_department = EXP_TYPE_COMMAND + base_paycheck_multiplier = BASEPAY_CAPTAIN outfit = /datum/outfit/job/captain @@ -96,6 +97,7 @@ Head of Personnel exp_requirements = 1500 exp_type = EXP_TYPE_SERVICE exp_type_department = EXP_TYPE_SERVICE + base_paycheck_multiplier = BASEPAY_COMMAND outfit = /datum/outfit/job/hop diff --git a/code/modules/jobs/job_types/cargo_service.dm b/code/modules/jobs/job_types/cargo_service.dm index 9dec1a40a..5663d9ace 100644 --- a/code/modules/jobs/job_types/cargo_service.dm +++ b/code/modules/jobs/job_types/cargo_service.dm @@ -15,6 +15,7 @@ Quartermaster is a real head fuck you minimal_player_age = 7 exp_type = EXP_TYPE_SUPPLY exp_type_department = EXP_TYPE_SUPPLY + base_paycheck_multiplier = BASEPAY_COMMAND exp_requirements = 1200 outfit = /datum/outfit/job/quartermaster @@ -88,6 +89,7 @@ Shaft Miner exp_requirements = 600 exp_type = EXP_TYPE_CREW exp_type_department = EXP_TYPE_SUPPLY + base_paycheck_multiplier = BASEPAY_DEFAULT * 1.2 //Just a teeny tiny bit more because they dangerous bro outfit = /datum/outfit/job/miner @@ -167,6 +169,7 @@ Bartender spawn_positions = 1 supervisors = "the head of personnel" selection_color = "#bbe291" + base_paycheck_multiplier = BASEPAY_ROOKIE outfit = /datum/outfit/job/bartender @@ -199,6 +202,7 @@ Cook spawn_positions = 1 supervisors = "the head of personnel" selection_color = "#bbe291" + base_paycheck_multiplier = BASEPAY_ROOKIE var/cooks = 0 //Counts cooks amount outfit = /datum/outfit/job/cook @@ -252,6 +256,7 @@ Botanist spawn_positions = 2 supervisors = "the head of personnel" selection_color = "#bbe291" + base_paycheck_multiplier = BASEPAY_ROOKIE outfit = /datum/outfit/job/botanist @@ -290,6 +295,7 @@ Janitor spawn_positions = 1 supervisors = "the head of personnel" selection_color = "#bbe291" + base_paycheck_multiplier = BASEPAY_ROOKIE var/global/janitors = 0 outfit = /datum/outfit/job/janitor diff --git a/code/modules/jobs/job_types/civilian.dm b/code/modules/jobs/job_types/civilian.dm index bceea3814..c0cc9965d 100644 --- a/code/modules/jobs/job_types/civilian.dm +++ b/code/modules/jobs/job_types/civilian.dm @@ -11,6 +11,7 @@ Clown spawn_positions = 1 supervisors = "the head of personnel" selection_color = "#dddddd" + base_paycheck_multiplier = BASEPAY_ROOKIE outfit = /datum/outfit/job/clown @@ -78,6 +79,7 @@ Mime spawn_positions = 1 supervisors = "the head of personnel" selection_color = "#dddddd" + base_paycheck_multiplier = BASEPAY_ROOKIE outfit = /datum/outfit/job/mime @@ -130,6 +132,7 @@ Curator spawn_positions = 1 supervisors = "the head of personnel" selection_color = "#dddddd" + base_paycheck_multiplier = BASEPAY_ROOKIE outfit = /datum/outfit/job/curator @@ -173,6 +176,7 @@ Lawyer spawn_positions = 2 supervisors = "the head of personnel" selection_color = "#dddddd" + base_paycheck_multiplier = BASEPAY_ROOKIE var/lawyers = 0 //Counts lawyer amount outfit = /datum/outfit/job/lawyer diff --git a/code/modules/jobs/job_types/civilian_chaplain.dm b/code/modules/jobs/job_types/civilian_chaplain.dm index 5f3daf1ba..496824d7f 100644 --- a/code/modules/jobs/job_types/civilian_chaplain.dm +++ b/code/modules/jobs/job_types/civilian_chaplain.dm @@ -13,6 +13,7 @@ Chaplain supervisors = "the head of personnel" selection_color = "#dddddd" custom_spawn_text = "You're playing a job that is essential for when the station deals with paranormal threats. While you have access to weapons, armor and tools such as your nullrod and bible, this does not mean you should hunt those threats unless warranted. If you have any questions, don't hesitate to ask mentors." + base_paycheck_multiplier = BASEPAY_ROOKIE outfit = /datum/outfit/job/chaplain diff --git a/code/modules/jobs/job_types/engineering.dm b/code/modules/jobs/job_types/engineering.dm index ce36edcc3..43a6f8d40 100644 --- a/code/modules/jobs/job_types/engineering.dm +++ b/code/modules/jobs/job_types/engineering.dm @@ -17,6 +17,7 @@ Chief Engineer exp_requirements = 1500 exp_type = EXP_TYPE_ENGINEERING exp_type_department = EXP_TYPE_ENGINEERING + base_paycheck_multiplier = BASEPAY_COMMAND outfit = /datum/outfit/job/ce @@ -189,6 +190,7 @@ Junior Engineer selection_color = "#fff5cc" exp_requirements = 120 exp_type = EXP_TYPE_CREW + base_paycheck_multiplier = BASEPAY_ROOKIE outfit = /datum/outfit/job/engineer/junior diff --git a/code/modules/jobs/job_types/job.dm b/code/modules/jobs/job_types/job.dm index b44914b71..ed4347265 100644 --- a/code/modules/jobs/job_types/job.dm +++ b/code/modules/jobs/job_types/job.dm @@ -62,7 +62,7 @@ var/list/alt_titles = list() /// A multiplier for how much a person gets each paycheck - var/base_paycheck_multiplier = 1 + var/base_paycheck_multiplier = BASEPAY_DEFAULT var/override_roundstart_spawn = null //Where the player spawns at roundstart if defined diff --git a/code/modules/jobs/job_types/medical.dm b/code/modules/jobs/job_types/medical.dm index 7c98d6640..eb142a67c 100644 --- a/code/modules/jobs/job_types/medical.dm +++ b/code/modules/jobs/job_types/medical.dm @@ -17,6 +17,7 @@ Chief Medical Officer exp_requirements = 1500 exp_type = EXP_TYPE_MEDICAL exp_type_department = EXP_TYPE_MEDICAL + base_paycheck_multiplier = BASEPAY_COMMAND outfit = /datum/outfit/job/cmo @@ -237,6 +238,7 @@ Junior Doctor selection_color = "#ffeef0" exp_requirements = 120 exp_type = EXP_TYPE_CREW + base_paycheck_multiplier = BASEPAY_ROOKIE outfit = /datum/outfit/job/doctor/junior @@ -278,6 +280,7 @@ Psychologist selection_color = "#ffeef0" exp_requirements = 240 exp_type = EXP_TYPE_CREW + base_paycheck_multiplier = BASEPAY_ROOKIE outfit = /datum/outfit/job/doctor/psychologist diff --git a/code/modules/jobs/job_types/science.dm b/code/modules/jobs/job_types/science.dm index fd72fbfe2..95ff1ecb7 100644 --- a/code/modules/jobs/job_types/science.dm +++ b/code/modules/jobs/job_types/science.dm @@ -17,6 +17,7 @@ Research Director exp_requirements = 1500 exp_type = EXP_TYPE_SCIENCE exp_type_department = EXP_TYPE_SCIENCE + base_paycheck_multiplier = BASEPAY_COMMAND outfit = /datum/outfit/job/rd @@ -154,6 +155,7 @@ Junior Scientist selection_color = "#ffeeff" exp_requirements = 120 exp_type = EXP_TYPE_CREW + base_paycheck_multiplier = BASEPAY_ROOKIE outfit = /datum/outfit/job/scientist/junior diff --git a/code/modules/jobs/job_types/security.dm b/code/modules/jobs/job_types/security.dm index c199641ff..a9421d5c0 100644 --- a/code/modules/jobs/job_types/security.dm +++ b/code/modules/jobs/job_types/security.dm @@ -23,6 +23,7 @@ Head of Security exp_requirements = 2000 exp_type = EXP_TYPE_SECURITY exp_type_department = EXP_TYPE_SECURITY + base_paycheck_multiplier = BASEPAY_COMMAND outfit = /datum/outfit/job/hos @@ -367,6 +368,7 @@ Junior Security Officer minimal_player_age = 3 exp_requirements = 300 exp_type = EXP_TYPE_CREW + base_paycheck_multiplier = BASEPAY_ROOKIE outfit = /datum/outfit/job/security/junior