cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-14 01:24:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Arconomy: The bigger balance PR (REVISED EDITION) [MDB IGNORE] (#13164)

Browse Source 
* Arconomy: The bigger balance PR (REVISED EDITION)

* yes

* wew

* Update multitool.dm

* yers

Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
This commit is contained in:
SkyratBot
2022-04-27 22:29:22 +02:00
committed by GitHub
parent f7f3b2a7c0
commit 044d75253c
162 changed files with 530 additions and 384 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/subsystem/economy.dm
+2 -12
View File
@@ -13,9 +13,8 @@ SUBSYSTEM_DEF(economy)
ACCOUNT_MED = ACCOUNT_MED_NAME,
ACCOUNT_SRV = ACCOUNT_SRV_NAME,
ACCOUNT_CAR = ACCOUNT_CAR_NAME,
ACCOUNT_SEC = ACCOUNT_SEC_NAME,
ACCOUNT_CMD = ACCOUNT_CMD_NAME, // SKYRAT EDIT
)
ACCOUNT_SEC = ACCOUNT_SEC_NAME)
var/list/generated_accounts = list()
/**
* Enables extra money charges for things that normally would be free, such as sleepers/cryo/beepsky.
@@ -48,7 +47,6 @@ SUBSYSTEM_DEF(economy)
var/bounty_modifier = 1
///The modifier multiplied to the value of cargo pack prices.
var/pack_price_modifier = 1
var/fire_counter_for_paycheck = 0 //SKYRAT EDIT ADDITION
/**
* A list of strings containing a basic transaction history of purchases on the station.
* Added to any time when player accounts purchase something.
@@ -82,7 +80,6 @@ SUBSYSTEM_DEF(economy)
dep_cards = SSeconomy.dep_cards
/datum/controller/subsystem/economy/fire(resumed = 0)
fire_counter_for_paycheck++ //SKYRAT EDIT ADDITION
var/temporary_total = 0
var/delta_time = wait / (5 MINUTES)
departmental_payouts()
@@ -90,17 +87,10 @@ SUBSYSTEM_DEF(economy)
station_target_buffer += STATION_TARGET_BUFFER
for(var/account in bank_accounts_by_id)
var/datum/bank_account/bank_account = bank_accounts_by_id[account]
//SKYRAT EDIT ADDITION BEGIN
if(fire_counter_for_paycheck >= PAYCHECK_CYCLE_WAIT)
bank_account.payday(PAYCHECK_CYCLE_AMOUNT)
//SKYRAT EDIT ADDITION END
if(bank_account?.account_job && !ispath(bank_account.account_job))
temporary_total += (bank_account.account_job.paycheck * STARTING_PAYCHECKS)
bank_account.payday(1)
station_total += bank_account.account_balance
//SKYRAT EDIT ADDITION BEGIN
if(fire_counter_for_paycheck >= PAYCHECK_CYCLE_WAIT) //30 minutes per each paycheck
fire_counter_for_paycheck = 0
//SKYRAT EDIT ADDITION END
station_target = max(round(temporary_total / max(bank_accounts_by_id.len * 2, 1)) + station_target_buffer, 1)
if(!HAS_TRAIT(SSeconomy, TRAIT_MARKET_CRASHING))
price_update()
code/controllers/subsystem/persistent_paintings.dm
+1 -1
View File
@@ -1,7 +1,7 @@
#define PAINTINGS_DATA_FORMAT_VERSION 2
// Patronage thresholds for paintings. Different cosmetic frames become available as more credits are spent on the patronage.
#define PATRONAGE_OK_FRAME PAYCHECK_ASSISTANT * 3 // 150 credits, as of early 2022
#define PATRONAGE_OK_FRAME PAYCHECK_CREW * 3 // 150 credits, as of march 2022
#define PATRONAGE_NICE_FRAME PATRONAGE_OK_FRAME * 2.5
#define PATRONAGE_GREAT_FRAME PATRONAGE_NICE_FRAME * 2
#define PATRONAGE_EXCELLENT_FRAME PATRONAGE_GREAT_FRAME * 2