Skip to content

Finance is now income, not wealth #1035

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

Merged
FalloutFalcon merged 4 commits into from
May 11, 2026
+20 −6
Merged

Finance is now income, not wealth #1035

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d016837
Update _job.dm
chazzyjazzy May 8, 2026
e972596
money
chazzyjazzy May 8, 2026
d4eb97d
Update account.dm
chazzyjazzy May 8, 2026
5b353fc
Update economy.dm
chazzyjazzy May 8, 2026
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
2 changes: 1 addition & 1 deletion code/controllers/subsystem/economy.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ SUBSYSTEM_DEF(economy)
var/datum/bank_account/bank_account = cached_processing[cached_processing[i]]
if(bank_account?.account_job && !ispath(bank_account.account_job))
temporary_total += (bank_account.account_job.paycheck * STARTING_PAYCHECKS)
// bank_account.payday(1, skippable = TRUE) // DARKPACK EDIT REMOVAL
bank_account.payday(1, skippable = TRUE)
station_total += bank_account.account_balance
if(MC_TICK_CHECK)
cached_processing.Cut(1, i + 1)
Expand Down
15 changes: 10 additions & 5 deletions code/modules/jobs/job_types/_job.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,15 +221,20 @@
var/finance = st_get_stat(STAT_FINANCE)
switch(finance)
if(1)
bank_account.account_balance = rand(800, 1200)
bank_account.account_balance = rand(100, 200)
bank_account.paycheck_amount = 40
if(2)
bank_account.account_balance = rand(2000, 3000)
bank_account.account_balance = rand(300, 600)
bank_account.paycheck_amount = 80
if(3)
bank_account.account_balance = rand(4000, 6000)
bank_account.account_balance = rand(800, 1200)
bank_account.paycheck_amount = 120
if(4)
bank_account.account_balance = rand(7000, 9000)
bank_account.account_balance = rand(1200, 1600)
bank_account.paycheck_amount = 160
if(5)
bank_account.account_balance = rand(11000, 14000)
bank_account.account_balance = rand(2000, 3000)
bank_account.paycheck_amount = 250
// DARKPACK EDIT ADD END - Finance affects starting money
add_mob_memory(/datum/memory/key/account, remembered_id = account_id)
add_mob_memory(/datum/memory/key/bank_pin, remembered_id = bank_account.bank_pin) // DARKPACK EDIT ADD
Expand Down
9 changes: 9 additions & 0 deletions modular_darkpack/modules/economy/code/account.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
/datum/bank_account
var/times_used_without_pin = 0
var/paycheck_amount = 0

/datum/bank_account/payday(amount_of_paychecks, free = FALSE, skippable = FALSE, event = "Paycheck")
if(!paycheck_amount)
return FALSE
log_econ("[paycheck_amount] [MONEY_NAME] were given to [src.account_holder]'s account from income.")
adjust_money(paycheck_amount, "Paycheck")
bank_card_talk("Account now holds [MONEY_SYMBOL][account_balance].")
return TRUE

/datum/bank_account/proc/check_pin(mob/living/user, amount, obj/item/source)
//purchases over $20 require a pin, you have to use one eventually
Expand Down
Loading