From 66e0cb72b91e55265d361bd80b3fd81f192c55e9 Mon Sep 17 00:00:00 2001
From: DragonTrance <dylan661993@gmail.com>
Date: Wed, 8 Jun 2022 12:30:17 -0400
Subject: [PATCH 01/19] reworking economy, adding paychecks

---
 code/__DEFINES/subsystems.dm                  | 61 ++++++++++---------
 .../antagonists/bloodsucker/bloodsucker_ui.dm |  2 +-
 code/modules/jobs/job_types/job.dm            | 21 ++++---
 code/modules/vending/_vending.dm              |  4 +-
 .../code/controllers/subsystem/economy.dm     | 19 +++++-
 hyperstation/code/modules/economy/account.dm  | 38 +++++++-----
 hyperstation/code/obj/economy.dm              |  8 +--
 7 files changed, 89 insertions(+), 64 deletions(-)

diff --git a/code/__DEFINES/subsystems.dm b/code/__DEFINES/subsystems.dm
index 43d17deaa..57900a9f6 100644
--- a/code/__DEFINES/subsystems.dm
+++ b/code/__DEFINES/subsystems.dm
@@ -90,37 +90,38 @@
 // Subsystem fire priority, from lowest to highest priority
 // If the subsystem isn't listed here it's either DEFAULT or PROCESS (if it's a processing subsystem child)
 
-#define FIRE_PRIORITY_PING			10
-#define FIRE_PRIORITY_IDLE_NPC		10
-#define FIRE_PRIORITY_SERVER_MAINT	10
-#define FIRE_PRIORITY_RESEARCH		10
-#define FIRE_PRIORITY_VIS			10
-#define FIRE_PRIORITY_VORE			10
-#define FIRE_PRIORITY_GARBAGE		15
-#define FIRE_PRIORITY_WET_FLOORS	20
-#define FIRE_PRIORITY_AIR			20
-#define FIRE_PRIORITY_NPC			80
-#define FIRE_PRIORITY_PROCESS		25
-#define FIRE_PRIORITY_THROWING		25
-#define FIRE_PRIORITY_SPACEDRIFT	30
-#define FIRE_PRIORITY_FIELDS		30
-#define FIRE_PRIOTITY_SMOOTHING		35
-#define FIRE_PRIORITY_NETWORKS		40
-#define FIRE_PRIORITY_OBJ			40
-#define FIRE_PRIORITY_ACID			40
-#define FIRE_PRIOTITY_BURNING		40
-#define FIRE_PRIORITY_AIR_TURFS		40
-#define FIRE_PRIORITY_DEFAULT		50
-#define FIRE_PRIORITY_PARALLAX		65
-#define FIRE_PRIORITY_FLIGHTPACKS	80
-#define FIRE_PRIORITY_MOBS			100
-#define FIRE_PRIORITY_TGUI			110
-#define FIRE_PRIORITY_TICKER		200
+#define FIRE_PRIORITY_PING				10
+#define FIRE_PRIORITY_IDLE_NPC			10
+#define FIRE_PRIORITY_SERVER_MAINT		10
+#define FIRE_PRIORITY_RESEARCH			10
+#define FIRE_PRIORITY_VIS				10
+#define FIRE_PRIORITY_VORE				10
+#define FIRE_PRIORITY_GARBAGE			15
+#define FIRE_PRIORITY_ECONOMY			20
+#define FIRE_PRIORITY_WET_FLOORS		20
+#define FIRE_PRIORITY_AIR				20
+#define FIRE_PRIORITY_PROCESS			25
+#define FIRE_PRIORITY_THROWING			25
+#define FIRE_PRIORITY_SPACEDRIFT		30
+#define FIRE_PRIORITY_FIELDS			30
+#define FIRE_PRIOTITY_SMOOTHING			35
+#define FIRE_PRIORITY_NETWORKS			40
+#define FIRE_PRIORITY_OBJ				40
+#define FIRE_PRIORITY_ACID				40
+#define FIRE_PRIOTITY_BURNING			40
+#define FIRE_PRIORITY_AIR_TURFS			40
+#define FIRE_PRIORITY_DEFAULT			50
+#define FIRE_PRIORITY_PARALLAX			65
+#define FIRE_PRIORITY_NPC				80
+#define FIRE_PRIORITY_FLIGHTPACKS		80
+#define FIRE_PRIORITY_MOBS				100
+#define FIRE_PRIORITY_TGUI				110
+#define FIRE_PRIORITY_TICKER			200
 #define FIRE_PRIORITY_ATMOS_ADJACENCY	300
-#define FIRE_PRIORITY_STATPANEL		390
-#define FIRE_PRIORITY_CHAT			400
-#define FIRE_PRIORITY_OVERLAYS		500
-#define FIRE_PRIORITY_INPUT			1000 // This must always always be the max highest priority. Player input must never be lost.
+#define FIRE_PRIORITY_STATPANEL			390
+#define FIRE_PRIORITY_CHAT				400
+#define FIRE_PRIORITY_OVERLAYS			500
+#define FIRE_PRIORITY_INPUT				1000 // This must always always be the max highest priority. Player input must never be lost.
 
 // SS runlevels
 
diff --git a/code/modules/antagonists/bloodsucker/bloodsucker_ui.dm b/code/modules/antagonists/bloodsucker/bloodsucker_ui.dm
index c72ad2ca9..e1436daf2 100644
--- a/code/modules/antagonists/bloodsucker/bloodsucker_ui.dm
+++ b/code/modules/antagonists/bloodsucker/bloodsucker_ui.dm
@@ -93,7 +93,7 @@
 		dat += "</table>"
 	dat += "</div>"
 	if(onstation && C && C.registered_account)
-		dat += "<b>Balance: $[account.account_balance]</b>"
+		dat += "<b>Balance: $[account.balance]</b>"
 	if(istype(src, /obj/machinery/vending/snack))
 		dat += "<h3>Chef's Food Selection</h3>"
 		dat += "<div class='statusDisplay'>"
diff --git a/code/modules/jobs/job_types/job.dm b/code/modules/jobs/job_types/job.dm
index 79711fd1a..632f7cf7b 100644
--- a/code/modules/jobs/job_types/job.dm
+++ b/code/modules/jobs/job_types/job.dm
@@ -61,6 +61,9 @@
 
 	var/list/alt_titles = list()
 
+	/// A multiplier for how much a person gets each paycheck
+	var/base_paycheck_multiplier = 0.7
+
 	var/override_roundstart_spawn = null		//Where the player spawns at roundstart if defined
 
 	//whitelisting
@@ -95,15 +98,6 @@
 	if(!H)
 		return FALSE
 
-	if(!visualsOnly)
-		var/datum/bank_account/bank_account = new(H.real_name, src)
-		bank_account.account_holder = H.real_name
-		bank_account.account_job = src
-		bank_account.account_id = rand(111111,999999) //give account ID!
-		//bank_account.account_pin = rand(1000,9999) //give random pin!
-		bank_account.account_balance = 80
-		H.account_id = bank_account.account_id
-
 	if(CONFIG_GET(flag/enforce_human_authority) && (title in GLOB.command_positions))
 		if(H.dna.species.id != "human")
 			H.set_species(/datum/species/human)
@@ -118,7 +112,14 @@
 	H.dna.species.after_equip_job(src, H, visualsOnly)
 
 	if(!visualsOnly && announce)
-		announce(H)
+		generate_bank_account()
+		if(announce)
+			announce(H)
+
+/// Generates a bank account for the person who's getting this job datum
+/datum/job/proc/generate_bank_account(mob/living/carbon/human/reciever)
+	var/datum/bank_account/bank_account = new(H.real_name, src)
+	return bank_account
 
 /datum/job/proc/get_access()
 	if(!config)	//Needed for robots.
diff --git a/code/modules/vending/_vending.dm b/code/modules/vending/_vending.dm
index db6dd01d9..d57c37f32 100644
--- a/code/modules/vending/_vending.dm
+++ b/code/modules/vending/_vending.dm
@@ -497,8 +497,8 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
 			updateUsrDialog()
 			vend_ready = 1
 			if(bankid && R == buying) //if we have a bank id, and we are trying to buy the same thing!
-				if(bankid.account_balance >= R.price)
-					bankid.account_balance -= R.price //take the money from the account.
+				if(bankid.balance >= R.price)
+					bankid.balance -= R.price //take the money from the account.
 					menu = 1
 					to_chat(usr, "<span class='notice'>You [R.name] via the provided bank account!</span>")
 					bankid = null //so noone can buy from your account after youve purchased stuff
diff --git a/hyperstation/code/controllers/subsystem/economy.dm b/hyperstation/code/controllers/subsystem/economy.dm
index e30e05c76..415569720 100644
--- a/hyperstation/code/controllers/subsystem/economy.dm
+++ b/hyperstation/code/controllers/subsystem/economy.dm
@@ -1,10 +1,23 @@
 SUBSYSTEM_DEF(economy)
 	name = "Economy"
 	wait = 5 MINUTES
+	priority = FIRE_PRIORITY_ECONOMY
 	init_order = INIT_ORDER_ECONOMY
 	runlevels = RUNLEVEL_GAME
-	flags = SS_NO_FIRE //Let's not forget this. This subsystem does not use fire and was needlessly using CPU.
+	/// How many "paychecks" someone gets at the creation of the bank account
 	var/roundstart_paychecks = 5
-	var/budget_pool = 35000
-	var/list/generated_accounts = list()
 	var/list/bank_accounts = list() //List of normal accounts (not department accounts)
+
+/datum/controller/subsystem/economy/fire()
+	for(var/datum/bank_account/account as anything in bank_accounts)
+		account.AddPaycheck(GetPaycheck(account, account.account_job))
+
+/**
+ * Returns a value of the amount of money a bank account would be getting. It's just some simple multiplication.
+ * Both the bank account and job is allowed to be null here.
+ * 
+ * Thanks to the ultimate nature of byond, double-colon accessors, ::, get the default values of the bank account and
+ * job datums if the respective one is null. You can pass zero arguments here and you'd get the "default" amount of a paycheck.
+ */
+/datum/controller/subsystem/economy/proc/GetPaycheck(datum/bank_account/account, datum/job/job, multiplier=1)
+	return account::base_pay * job::base_paycheck_multiplier * multiplier
diff --git a/hyperstation/code/modules/economy/account.dm b/hyperstation/code/modules/economy/account.dm
index 039ab4482..011df17a2 100644
--- a/hyperstation/code/modules/economy/account.dm
+++ b/hyperstation/code/modules/economy/account.dm
@@ -1,29 +1,39 @@
 #define DUMPTIME 3000
 
 /datum/bank_account
-	var/account_holder = "Some pleb"
-	var/account_balance = 0
-	var/account_offstation_balance = 0
+	var/account_holder = "Some pleboid"
+	var/balance = 0
 	var/account_pin = 0
-	var/account_dna = ""
 	var/datum/job/account_job
+	var/obj/item/card/id/associated_id
 	var/list/bank_cards = list()
-	var/add_to_accounts = TRUE
-	var/transferable = TRUE
-	var/account_id
-	var/withdrawDelay = 0
+	var/account_id = 1
+	var/base_pay = 60
 
-/datum/bank_account/New(newname, job)
-	if(add_to_accounts)
-		if(!SSeconomy)
-			log_world("Wack")
-		SSeconomy.bank_accounts += src
+/datum/bank_account/New(newname="Some plebith", datum/job/job)
 	account_holder = newname
 	account_job = job
 	account_id = rand(111111,999999)
 
+	if(!SSeconomy || !SSeconomy.initialized)
+		stack_trace("A new bank account was made without the economy subsystem being initialized first. If this is an issue, change the subsystem's init_order.")
+		return
+
+	SSeconomy.bank_accounts += src
+	balance += SSeconomy.GetPaycheck(src, job, SSeconomy.roundstart_paychecks)
+
+/// Helper for whenever a paycheck gets processed into this account from the economy SS. Simply adds an amount to the account balance and notifies the user.
+/datum/bank_account/proc/AddPaycheck(amount, silent=FALSE)
+	balance += amount
+	if(associated_id && !silent)
+		var/local_turf = get_turf(associated_id)
+		var/hearers = ohearers(1, local_turf)
+		for(var/mob/M in hearers)
+			M.playsound_local(local_turf, 'sound/machines/twobeep_high.ogg', 50, vary = TRUE)
+			to_chat(M, "[icon2html(src, associated_id.loc)] <span class='notice>Paycheck processed, your account now holds [balance] credits.</span>")
+
 /datum/bank_account/Destroy()
-	if(add_to_accounts)
+	if(SSeconomy)
 		SSeconomy.bank_accounts -= src
 	return ..()
 
diff --git a/hyperstation/code/obj/economy.dm b/hyperstation/code/obj/economy.dm
index 388fccf5e..28f3cb5c1 100644
--- a/hyperstation/code/obj/economy.dm
+++ b/hyperstation/code/obj/economy.dm
@@ -39,7 +39,7 @@
 
 		if(idcard.registered_account)
 			if(!idcard.registered_account.account_pin || pin == idcard.registered_account.account_pin)
-				dat += "<p>Balance: <b>$[idcard.registered_account.account_balance]</b>"
+				dat += "<p>Balance: <b>$[idcard.registered_account.balance]</b>"
 				//dat += "<p>Offstation Balance: <b()</b>"
 				dat += "<p>"
 				dat	+= "<a href='byond://?src=[REF(src)];withdraw=1'>Withdraw</A>"
@@ -78,7 +78,7 @@
 		if(held_card)
 			var/obj/item/stack/credits/cred = I
 			var/obj/item/card/id/idcard = held_card
-			idcard.registered_account.account_balance = (idcard.registered_account.account_balance+cred.amount)
+			idcard.registered_account.balance = (idcard.registered_account.balance+cred.amount)
 			to_chat(usr, "<span class='notice'>You insert [cred] into the ATM.</span>")
 			src.ui_interact(usr)
 			del(cred)
@@ -138,9 +138,9 @@
 			if(idcard.registered_account)
 				var/amount = input(user, "Choose amount", "Withdraw") as num|null
 				if(amount>0)
-					amount = max(min( round(text2num(amount)), idcard.registered_account.account_balance),0) //make sure they aint taking out more then what they have
+					amount = max(min( round(text2num(amount)), idcard.registered_account.balance),0) //make sure they aint taking out more then what they have
 					to_chat(usr, "<span class='notice'>The machine prints out [amount] credits.</span>")
-					idcard.registered_account.account_balance = (idcard.registered_account.account_balance-amount) //subtract the amount they took out.
+					idcard.registered_account.balance = (idcard.registered_account.balance-amount) //subtract the amount they took out.
 					var/obj/item/stack/credits/C = new /obj/item/stack/credits/(loc)
 					C.amount = amount
 					if(usr.put_in_hands(C))

From 3f76c507e4b6209fcc6fd17ee3f72fbab5935cf1 Mon Sep 17 00:00:00 2001
From: DragonTrance <dylan661993@gmail.com>
Date: Wed, 8 Jun 2022 12:32:25 -0400
Subject: [PATCH 02/19] stop sending src.var im tired of seeing it!my friends
 on tictoc send me src.var, my friends on discord send me src.var

---
 hyperstation/code/obj/economy.dm | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/hyperstation/code/obj/economy.dm b/hyperstation/code/obj/economy.dm
index 28f3cb5c1..2e438ef73 100644
--- a/hyperstation/code/obj/economy.dm
+++ b/hyperstation/code/obj/economy.dm
@@ -72,7 +72,7 @@
 			user = idcard.registered_name
 			pin = ""
 			playsound(src, 'sound/machines/button.ogg', 50, FALSE)
-			src.ui_interact(usr)
+			ui_interact(usr)
 
 	if(istype(I, /obj/item/stack/credits)) //feed money back into the machine! dont need a pin to donate stuff.
 		if(held_card)
@@ -80,7 +80,7 @@
 			var/obj/item/card/id/idcard = held_card
 			idcard.registered_account.balance = (idcard.registered_account.balance+cred.amount)
 			to_chat(usr, "<span class='notice'>You insert [cred] into the ATM.</span>")
-			src.ui_interact(usr)
+			ui_interact(usr)
 			del(cred)
 
 /obj/machinery/atm/Topic(href, href_list)
@@ -106,29 +106,29 @@
 		var/pininput = input(user, "Input pin", "Pin Number") as num|null
 		if(pininput)
 			if(pininput > 9999 || pininput < 1000)
-				to_chat(usr, "<span class='notice'>[src.name] buzzes, you must input a 4 digit number between 1000 and 9999.</span>")
+				to_chat(usr, "<span class='notice'>[name] buzzes, you must input a 4 digit number between 1000 and 9999.</span>")
 				return
 			pin = max(min( round(text2num(pininput)), 9999),1000) //4 numbers or less.
 			var/obj/item/card/id/idcard = held_card
 			if(pin == idcard.registered_account.account_pin)
-				to_chat(usr, "<span class='notice'>[src.name] beeps, accepting the pin.</span>")
+				to_chat(usr, "<span class='notice'>[name] beeps, accepting the pin.</span>")
 			else
-				to_chat(usr, "<span class='notice'>[src.name] buzzes, denying the pin.</span>")
+				to_chat(usr, "<span class='notice'>[name] buzzes, denying the pin.</span>")
 
 	if(href_list["changepin"])
 		playsound(src, get_sfx("terminal_type"), 25, 1)
 		var/pinchange = input(user, "Input pin", "Pin Number") as num|null
 		if(pinchange > 9999 || pinchange < 1000)
-			to_chat(usr, "<span class='warning'>[src.name], you must have a 4 digit number for a pin and be between 1000 and 9999.</span>")
+			to_chat(usr, "<span class='warning'>[name], you must have a 4 digit number for a pin and be between 1000 and 9999.</span>")
 			return
 		if(pinchange)
 			var/pinchange2 = input(user, "Confirm pin", "Confirm pin") as num|null //time to confirm!
 			if(pinchange == pinchange2)
 				var/obj/item/card/id/idcard = held_card
 				idcard.registered_account.account_pin = pinchange
-				to_chat(usr, "<span class='notice'>[src.name] beeps, your pin has been changed to [pinchange]!.</span>")
+				to_chat(usr, "<span class='notice'>[name] beeps, your pin has been changed to [pinchange]!.</span>")
 			else
-				to_chat(usr, "<span class='warning'>[src.name] buzzes, your pins did not match!</span>")
+				to_chat(usr, "<span class='warning'>[name] buzzes, your pins did not match!</span>")
 		pin = ""
 
 	if(href_list["withdraw"])

From f889a49ab1e686f6945eeed9088c71bb13eeba59 Mon Sep 17 00:00:00 2001
From: DragonTrance <dylan661993@gmail.com>
Date: Wed, 8 Jun 2022 12:35:12 -0400
Subject: [PATCH 03/19] more src memery

---
 code/modules/jobs/job_types/job.dm                 | 8 ++++----
 hyperstation/code/controllers/subsystem/economy.dm | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/code/modules/jobs/job_types/job.dm b/code/modules/jobs/job_types/job.dm
index 632f7cf7b..ed11b8e30 100644
--- a/code/modules/jobs/job_types/job.dm
+++ b/code/modules/jobs/job_types/job.dm
@@ -118,19 +118,19 @@
 
 /// Generates a bank account for the person who's getting this job datum
 /datum/job/proc/generate_bank_account(mob/living/carbon/human/reciever)
-	var/datum/bank_account/bank_account = new(H.real_name, src)
+	var/datum/bank_account/bank_account = new(reciever.real_name, src)
 	return bank_account
 
 /datum/job/proc/get_access()
 	if(!config)	//Needed for robots.
-		return src.minimal_access.Copy()
+		return minimal_access.Copy()
 
 	. = list()
 
 	if(CONFIG_GET(flag/jobs_have_minimal_access))
-		. = src.minimal_access.Copy()
+		. = minimal_access.Copy()
 	else
-		. = src.access.Copy()
+		. = access.Copy()
 
 	if(CONFIG_GET(flag/everyone_has_maint_access)) //Config has global maint access set
 		. |= list(ACCESS_MAINT_TUNNELS)
diff --git a/hyperstation/code/controllers/subsystem/economy.dm b/hyperstation/code/controllers/subsystem/economy.dm
index 415569720..69dee7c8c 100644
--- a/hyperstation/code/controllers/subsystem/economy.dm
+++ b/hyperstation/code/controllers/subsystem/economy.dm
@@ -15,9 +15,9 @@ SUBSYSTEM_DEF(economy)
 /**
  * Returns a value of the amount of money a bank account would be getting. It's just some simple multiplication.
  * Both the bank account and job is allowed to be null here.
- * 
- * Thanks to the ultimate nature of byond, double-colon accessors, ::, get the default values of the bank account and
+ *
+ * Thanks to the ultimate nature of byond, colon accessors, :, get the default values of the bank account and
  * job datums if the respective one is null. You can pass zero arguments here and you'd get the "default" amount of a paycheck.
  */
 /datum/controller/subsystem/economy/proc/GetPaycheck(datum/bank_account/account, datum/job/job, multiplier=1)
-	return account::base_pay * job::base_paycheck_multiplier * multiplier
+	return account:base_pay * job:base_paycheck_multiplier * multiplier

From c3a671dfac7d8fe2d82f1a060e8a18541bcd615b Mon Sep 17 00:00:00 2001
From: DragonTrance <dylan661993@gmail.com>
Date: Wed, 8 Jun 2022 12:37:11 -0400
Subject: [PATCH 04/19] Create twobeep_high.ogg

---
 sound/machines/twobeep_high.ogg | Bin 0 -> 5576 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 sound/machines/twobeep_high.ogg

diff --git a/sound/machines/twobeep_high.ogg b/sound/machines/twobeep_high.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..b97b39a4f01bde92153452322f240088ca3b3515
GIT binary patch
literal 5576
zcmai130#v$)8EJuj(`yY1`Tb(Aqf&oxHMEWf>a405C}++B7ukyKsi0ZD1jm(B1Xi3
z7$8A8f=U4eKLte)x#SF96j1~etOrG{T75UcwtoG-U*G4q+3d5kJF_$MpLu3I!os}4
zJn-cS`|@vhh+v2K29dZemK`1^pF^yz{6gA+Pz)|1Jmfq7dgMFhloJLON$BrC|F7qk
z(j23ukiIc|`_^S1v0?bgaJH|4J>CUxWl6EJw6e6u6Fs7$!?(wB;yBUqBsp({%G_3x
zqmwTJsKFVE8@`3tlg$JG4Zvm-lJ>DJE+mPdh`1|HuwFiDu{@Y3IM{*>$)vRY+2L(M
z^#D)?JfeD5$+$~IH#H1vmK7_ahHqGL29M0}dPr5jKD#6&y0oU08{JJZRnziU0njeA
z^@LOmL*B8|329i^{e+8cBb+IS)i6IRI-p_IhEH*`dMZA)!T#ylk}UgY#F`#QO>#{i
z-HkHn8&Y*eHE?fSH+7=mOQ){T0}s#QsA>?3c2twIPbZb;#X?qdYT*G7stMK|#kgF+
zbX>r7^_qCRw(!!m?X`CH_Hk#zCn3-;ku#K-FqD|&pO+eNDarp*YQUY;z_+Qv*t9S0
zUDC)~c~hv4M*xvAHTN;8*l1DlBWke{Kdo{e2$h=zubyK>$|-Rv-4an1o?o}MqAseV
z+M=TxrC0)esw_VZ5QPg%|4-ZEpUe60jkdMT9MGUGZ^qzm#+W!WOm4<nAQcvF1JI{5
zhDA%P&AK?7n{g{)TNl6fmcXs+H@EqJIzjGs0B96kOAPK7v<8FRA8YFu=P(rKJ_Jo6
zx5&Rg`xSVBiV#k1$&KKtS!V|;%)*0gu|;Z5s5wb+L3+^`Uf3g?>7r^2pNPsZ`Tf@p
z`sAC{m*wRvJQ&$+@EH1%)PAx>bh1Yn*X@E5O6Eqpbn=nXvOYLxFj1i0Y7h+9h4%@O
zWp_8iz5YGI@w4?9I65fEH><7pndA2b7G*ycbYG*6!W{?i<#X%R1L5fR(1KsP)a7&k
zgbxk+E%*+$_0$1;QkE(kLntL2`zHQ~_AwEqjU@i&aMlm>vJ_8-fte)!fI@RT0DQCp
z#ea4RD9@o-oReYRPW-vks>4FwRW^6qPn~Z@JE15L#TK>@#fNLh3*)M&>$#Fz8EdIT
zz@U>Pa}fodiVw|RqiUcClC-?ocG4Lb6<<5<rOE9DhP_|4+pln5I;ODoT9Li29hg2$
zzr-m26AAY(rUu?g7#T_$89E%aFzuhf`YUn(3>v;7CI#$F%FTk54UXz_4*oN8VlX$4
z;%*%^ajiCS@3ZK7ZR0Ux)2r+3W#jIx7uc(p(67(&whQdH<@7T-gNdBGb)0~UN&a<T
z0%k63Murl;iX3@}7*Vqxug_8bJ90$CtVb)dj9qd}{BxG<$_+axEIV2Fw5(X;ACa>)
z<4j)0ne>c_^ep1R-0*|K^7`V)_Nu9d|JweFoOQ7#u))Z2jy3rza+)YOCm2oD7Va~1
zIy&@1gT^~A{MrEkG-ab)6?w#qK^|n-4l>A0ABTUB7)TwoaqqW*hCL2|0RYC($$WH1
zY_?;x!$vjAxQR*;Rki2_mVX9qjiPE9#b>WEbGVd4ZAQ&JWDxb%x}_X8U7m&4x?Z};
z<;e;)nD&%`7XUm;8|4Nzw%g^FXl*w|{gj}MY9=|>=RzXqVy#K0r8*&x3rhN2Zixk0
z*NjtQosff4xCtQPPqU~eTMt3Q0Ki5uG)SoeMmK3Zo6$~rf@9FBX9~Q#scMG&c8cn$
z6f{YK^X?|y#PK`VJSj-&SwjQ>--LiaN1{!rGeDbxhuckVAG2}An7ZmZ-^Or;blr!J
z+jQC3digLrbeV%b%=`N8%sNwdU3d52e3-h<Og(0Qt~;|f>b4E%t`BoqpE+2^xv!t>
zmzywR?d}g>WssUMl$#VJiwey9!pa?^U}eV~s<ZWqXL>O?{yt3qM2`Pkrk^ay6;i$3
z@9Hs`b<Df7QOw+=(RgN{ALs5{roVo2z)<Swo1{^!ob%9N0;C4ZIKdYaMu_3U@QC8G
z<w9b4d0BZ~RC$#&pm?&pxV*hOth}nSz4}~5Rpb<;R-G-cwkR*RsHm>|P;N0*cecDi
z+FpG=zp7%Y?uBNv#Z<%g@~Wze>S;N(K|0kMGu2?Zx0KXTTJfx*tf3)#sv)McE(%vt
z{_LuG$My5=)i0(RzN<+fcrg=(1%Z$KpdL{{I|>8drdCIN-zfdi4jJ^lqu$<ztB2cu
zj$RDsT4$E74qlNZ2@}GTmP_-?E2gTWmo`^UIeIaZ0*`Y>mIwMTj2>B@6)<$Txcpgz
zdB;^Ki1MIy8}70tF7Un`B%G?2Y9@uWy;Z->z26%1!T#}^gpzY8^_xc^HV|@b=(f{}
z2utVjRv>^XVFKfgHgCblqZ!ZeVjqesA#MY`1t;*NM-T)9=B;?2ESI)|V><M$Btaho
zStRkKbBhEr2KPeg0Q)&!tWOUo3;I|QWvv6O%mpE6s|j&vw~M-@MoxgNCPZRwN4i9e
zaix=eJ0Xxu`qr#36YF@pl+{9360yE3ol=Jhh^EMJaEDkYz=hO`@s1+53XNOwkku`@
zaD|K~c>>7lWJ(U5E<K*Z=qxxUXO)sgcOli~(B0sv==2Mz3|1sXR=|j~g{Ok7a_Eud
zR#t#pZ33F5sW_Fi)|VS0ZH2;3C0JMbg<5@XG-Z4dJzOdmUe=-?kOhT%b8Smy5pqI6
zl!HtdN0-V57>6MtB<jkbaL<cBHD^bVTV-siT)6p#<2g|H_&ru8RnW(Vta2Eca7RF7
zeQ9n4BnTOYYRB)zMcTd@U{%UxxWX?)+>!cOUzl}xN`S^w=ZNGfL>{(l(iz<@;po^-
zs=2yjC)KPh*3FSbVs@@kGp+5Wl1MEws+y@p-_@Ml;>#tGpcZ6UcPPSE)%{=#LPN`6
z9jt{>+=_>JN7X=rP3ggkF(GIp2^RWAf(e1P#l~qnnj3_4uOX87o^*3kDw^(MDuD&A
z1`gJ9kv)QqIC!ABJhB<ZMp4r6@jh1O3;1qyv$FlrqS6Ei1xZUMD?(axho&Y?m07u(
zLMUvJ-pFIY3U(SEXj+j+OhGmh(6A*?E;S6z?xarQY+z=@@wLrc3sSTl)%4&o;J2!i
z3OlqTB*1#FC<S&BL7$w!pg+aKIg%t^P7p9O05IPUE28sWp>YR}ieS#12X@JGCY_2b
z68u1F#S3y6P#jdLEEWZA*WxQD2w2m22#rYFL^Om|E6a&4ZQ01JB1mNHO4}g_;@WW`
zmktTsu6h6-s35_4rNz#6W>|G|n^1)kJUldGCM6BS&Y(;bIH{3Z@?ecqij|ih@FOd)
zKQbW!zP3UFbpj{v3gWW<E=>L&ssBGpl)*Y{fiL`8w_+Eo%~j<;=qO%8BEJ;rd2_E{
z)$D&)@BcOm;7TFnzU~06Q3DA+BNzLwTR~c+X(87Utqlvk<~(>}RYQInX;RFG?kRGj
zQ;DV!B_tAr4~%F5i+(bW!7w+K<jPaW0E<qBypg6786yHpu~(DS49G>@S+kxbk+BYu
zVaU<pD?8IRjRBXm++kNz#C;4HpV*K}7(gs8JUW+5s+F-bYoYyNhLEuj*~(a&;9>N3
zz*~PlChfTR=j*)>6}~3GV%t$+ZTZE30evBoqlK`R4pAk?2!RjXFgM4~{%a0xKQRX_
z2&jp<bplUE1+>(P;2g;if{dsbnZl9!Tmh#5BVPxWastSCZcd;BWhlx!0Yi>RXc{>|
z0ae9Fogg=tVliQEue=t75LJ?AVdF`Yl6Ip=o6+k^o?F}KfQJGg=1#;EN!EsMDd6Y2
z^0Q;n>}3lW8Ps(bIO`2su!91M1mn%%P8P5;y*y5Z&?(K80$)1u=z+f2%G$(Ec%#It
z0ZTN&dOr<;!L~s`d}R_4op0))Y*JPp)3MS(Y24(;^@S?|G`|gXG<_pVN4I=`G20$&
z+_bq3$wM7JTyscs(yB=%@IeBek5?w7w;(XtycFH&osYCUE?rZ%ca~_+U4Rkb8vt^&
z@J2>LYL@nq`Pt~B3vzUh=?Wlx0eFbu%?CUamGt!VEm<YakCjZ;hVsQX#*|GJWO=8i
zHg{D~R*V%FWaUEa99e!rmW$ER5NR&7TGmuYBrheBOwG+KmR-JPLAJ24SZ=d2_FUo6
zuC#M2&3iJQ?qeThEkF7&f0>Ta>)z%U<F1|WSG@>c%{5zi)Y|m!bE&)a?s!$q?x1?<
zz0^xjqWAlX?jstsY0nR|OgAP<2%~SZHl<!)Ww*1?D8MK6X`+2^Ah<Vam`wfQ{kqOJ
z%cMOKd*6LV00A0Q-=G5iQdjUt$TczY06ZdZG{(*Ny2gO*8Lx^r7k#@2>=$WpD~_cl
zK*wwF#Mz>sJj3_Ryn933Zaa|RdIkIIl5nk+S5IGVUj(zW$m-?Y%SRf2`{u-$M^x9V
z10No7cdxFgiMDi?k{3!IzMK>}QxDBsV5FqB^9O2eUWd*_jnrmw?TNOQ$trEbWYoLp
zg^^b`B5^D0%DN0{_Sf)-r?v?%7{7d8<^^PTx(a5F{N8kQ@3;Ox$Gk|6J3UM`tfM>%
zM$$ezfz6c`i0MX}83m$d+`80n=E3a`x9js(@7})ZmDFXbLy%91d0%z(<><iVhATmn
z8JBf?oyW;%j~lIomrIAr<(huqTE(dLusm2(ub$I;LMMP<4cR4XY+c82Z`eCMU6ryX
zlYH}{6%w5F&LX9*GhpQcp!8m-bMO8<yru=XdL`Sm;@S(Zg^y=`QJ-OCWIg||uUEJL
z08B)X1MXGfM-NuG-H2*7&_y&(Q@M53H9?E^oNAuFv{xlBTg)+zN72tw-JS{Nr;d$M
zzo%u++iZk?Abod<(p<8@t~8^o(&C9E^>Su(#^Yjps@<4_>r!;ce2h)$8w8mK+z^$y
zJKuY9gwO0l#K(VjBGrl)`-#PwJ2GBsPdkvb$6l)B94bl#nwDDWrUO1>c1S(WrT-!K
zH@|NzzQ3U8<f9`*FlM{or|sg$g{ad}-}6-RP{i9~hq(G1^lSx(d|tB}w|#I6X>q@K
zMonp&LQ;tzYV6Uw_GU3p<!m&q>+)bpf%126pWdSd`LNZLM6-n`WjhD2y4g>kjJ;%f
zTUGBq2ileeIxL&wP*Y>}7;8e({5Cax`i~8X8047kj)W^W0zWRv-h?=-MVs%5-2Q~a
zY-p|cZED-e@Q)K1wl6hl2>BazN4LfA6%UR%zTRBes_hACd9!9+RfcN=oOiNDcP*+U
z_WGh1eJ&Aijsg#YgDzIvum0U5B%E{Sxl)5OXh(#7$|cyJt9mf}V$;c0OCJa1v(oAV
zjZKUVLBk!xx^M28I0U@XZZ7jKY5t4^B1Co5Ck@bNrwIzkYj!SnQ33#UBqVW%i8x{E
zR_gDat^rH>`;qha74Rywx_*3W52kS9d0VrTVmfCA8Jyz>cJC&6kWPJA;T1Pib#hpC
z@57MO=eoD$O9C(N|JDBEtHy8ji}|l|j#O;hXEtkEyQuW^Ya&-`ar*PFkVR3hfkCt7
zP9JC{-?C;2Gr^-xIF0j_s|6(0AFG6?{I6};e0prd)$z*vFjVcHc17>FVz#$*>^p&H
zV?)Gb^mP7;<%a$J7nUY`hr&KZ{-FgHH<`GCT_e2GVYs15mOpy<vrggg?Du+WSAF{R
z<F-?gBhkx*+>VKQryHHOM!Ca#UR-(m%ZDm}4-2Z&xUnb5CJQrl=Gzw)Co_rqzbqrN
ztZF=1d!0WqjGf;qr{}~EAOYT0yQkZI(&g6r*IB{rhr2aZK3Ojq3Q~<{^>DE#pj3d8
zQCMKJR?`UKy!v&+6_W14MS}^Nkbp@Jii?_V9C_W-tWjh6i>f6NY_{6k<Vfe8U;ilf
z2-AKT)BE7#t&H1#JTxjfXh)REr+tr|b_9uPw=CSj`vD=+-uUvghu-)(_Y-HmN`s#N
z*!;pT`n|6WLOD5T&#>S4$f}Nky_;AS+ZOk@gNP-b)rG|E54I2Q^s248Mf=>r6#1+z
zKtRTOlFp0|Rp}L(To-LaZhg7}MCfi$#%Y6h{lAbOEGL#Mot>Rmo7_~b^f4)D#~<JQ
zkwjOg8KGvl-{L3jfwzw5g@xyO)~?>P@L}+1hI!U|;3>O(7}&7SHIDm-=Qi4ylS|(R
z(w4WDttyUtkbLNJVL^VM1Lyjl^yoULWwHrJ{QI8*x+|}DVJ=p#2R>`|P5&PKp=MLs
w+7+Tg_01(IajSRAW>3b(7<`v(Scd+nyJvOirDHF`l&=XAdDyFC$y;>)0}TBkOaK4?

literal 0
HcmV?d00001


From 972d3f5e19b5217769fb2b0f208b01991dd0a309 Mon Sep 17 00:00:00 2001
From: DragonTrance <dylan661993@gmail.com>
Date: Wed, 8 Jun 2022 17:18:54 -0400
Subject: [PATCH 05/19] fixing shit, todo: accounts for anyone

---
 code/modules/jobs/job_types/job.dm            | 29 ++++++++++---------
 .../code/controllers/subsystem/economy.dm     |  4 +--
 hyperstation/code/modules/economy/account.dm  | 15 ++++------
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/code/modules/jobs/job_types/job.dm b/code/modules/jobs/job_types/job.dm
index ed11b8e30..eadf53fdc 100644
--- a/code/modules/jobs/job_types/job.dm
+++ b/code/modules/jobs/job_types/job.dm
@@ -106,20 +106,20 @@
 	//Equip the rest of the gear
 	H.dna.species.before_equip_job(src, H, visualsOnly)
 
+	if(!visualsOnly)
+		generate_bank_account(H) //TODO: accounts assigned to IDs. makes this less ugly
+
 	if(outfit_override || outfit)
 		H.equipOutfit(outfit_override ? outfit_override : outfit, visualsOnly)
 
-	H.dna.species.after_equip_job(src, H, visualsOnly)
-
 	if(!visualsOnly && announce)
-		generate_bank_account()
-		if(announce)
-			announce(H)
+		announce(H)
+
+	H.dna.species.after_equip_job(src, H, visualsOnly)
 
 /// Generates a bank account for the person who's getting this job datum
 /datum/job/proc/generate_bank_account(mob/living/carbon/human/reciever)
-	var/datum/bank_account/bank_account = new(reciever.real_name, src)
-	return bank_account
+	return new/datum/bank_account(reciever, src)
 
 /datum/job/proc/get_access()
 	if(!config)	//Needed for robots.
@@ -234,8 +234,8 @@
 		else
 			H.real_name = "[J.title] #[rand(10000, 99999)]"
 
-	var/obj/item/card/id/C = H.wear_id
 	var/client/preference_source = H.client
+	var/obj/item/card/id/C = H.wear_id
 	if(istype(C))
 		C.access = J.get_access()
 		shuffle_inplace(C.access) // Shuffle access list to make NTNet passkeys less predictable
@@ -246,11 +246,14 @@
 		else
 			C.update_label()
 
-		for(var/A in SSeconomy.bank_accounts)
-			var/datum/bank_account/B = A
-			if(B.account_id == H.account_id)
-				C.registered_account = B
-				B.bank_cards += C
+		for(var/datum/bank_account/account as anything in SSeconomy.bank_accounts)
+			if(account.account_id == H.account_id)
+				C.registered_account = account
+				account.bank_cards += C
+									//Todo: remove bank_cards, have accounts for everyone who knows the pin to an ID. monkey go ook ook (he's rich)
+									//one card should have one account, sorta like how real cards work
+									//ping cyanosis if bank_cards is still here
+				account.associated_id = C	//Also make this better to work with
 				break
 		H.sec_hud_set_ID()
 
diff --git a/hyperstation/code/controllers/subsystem/economy.dm b/hyperstation/code/controllers/subsystem/economy.dm
index 69dee7c8c..ca1fa5201 100644
--- a/hyperstation/code/controllers/subsystem/economy.dm
+++ b/hyperstation/code/controllers/subsystem/economy.dm
@@ -3,14 +3,14 @@ SUBSYSTEM_DEF(economy)
 	wait = 5 MINUTES
 	priority = FIRE_PRIORITY_ECONOMY
 	init_order = INIT_ORDER_ECONOMY
-	runlevels = RUNLEVEL_GAME
+	runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME
 	/// How many "paychecks" someone gets at the creation of the bank account
 	var/roundstart_paychecks = 5
 	var/list/bank_accounts = list() //List of normal accounts (not department accounts)
 
 /datum/controller/subsystem/economy/fire()
 	for(var/datum/bank_account/account as anything in bank_accounts)
-		account.AddPaycheck(GetPaycheck(account, account.account_job))
+		account.GivePaycheck(GetPaycheck(account, account.account_job))
 
 /**
  * Returns a value of the amount of money a bank account would be getting. It's just some simple multiplication.
diff --git a/hyperstation/code/modules/economy/account.dm b/hyperstation/code/modules/economy/account.dm
index 011df17a2..2caab9c8f 100644
--- a/hyperstation/code/modules/economy/account.dm
+++ b/hyperstation/code/modules/economy/account.dm
@@ -1,5 +1,3 @@
-#define DUMPTIME 3000
-
 /datum/bank_account
 	var/account_holder = "Some pleboid"
 	var/balance = 0
@@ -10,10 +8,10 @@
 	var/account_id = 1
 	var/base_pay = 60
 
-/datum/bank_account/New(newname="Some plebith", datum/job/job)
-	account_holder = newname
+/datum/bank_account/New(mob/living/carbon/human/new_holder, datum/job/job)
+	account_holder = new_holder.real_name
 	account_job = job
-	account_id = rand(111111,999999)
+	new_holder.account_id = account_id = rand(111111,999999)
 
 	if(!SSeconomy || !SSeconomy.initialized)
 		stack_trace("A new bank account was made without the economy subsystem being initialized first. If this is an issue, change the subsystem's init_order.")
@@ -23,14 +21,13 @@
 	balance += SSeconomy.GetPaycheck(src, job, SSeconomy.roundstart_paychecks)
 
 /// Helper for whenever a paycheck gets processed into this account from the economy SS. Simply adds an amount to the account balance and notifies the user.
-/datum/bank_account/proc/AddPaycheck(amount, silent=FALSE)
+/datum/bank_account/proc/GivePaycheck(amount, silent=FALSE)
 	balance += amount
 	if(associated_id && !silent)
 		var/local_turf = get_turf(associated_id)
-		var/hearers = ohearers(1, local_turf)
-		for(var/mob/M in hearers)
+		for(var/mob/M in get_hearers_in_view(1, local_turf))
 			M.playsound_local(local_turf, 'sound/machines/twobeep_high.ogg', 50, vary = TRUE)
-			to_chat(M, "[icon2html(src, associated_id.loc)] <span class='notice>Paycheck processed, your account now holds [balance] credits.</span>")
+			to_chat(M, "<span class='notice'>[icon2html(associated_id, M)] Paycheck processed, your account now holds [balance] credits.</span>")
 
 /datum/bank_account/Destroy()
 	if(SSeconomy)

From bbbb50dfe03fea8efe6d61bb5ff185ecf57d19b0 Mon Sep 17 00:00:00 2001
From: DragonTrance <dylan661993@gmail.com>
Date: Wed, 8 Jun 2022 17:54:15 -0400
Subject: [PATCH 06/19] limits ID cards to one account

---
 code/controllers/subsystem/job.dm             | 10 ++++-----
 code/game/machinery/computer/card.dm          |  2 +-
 code/game/objects/items/cards_ids.dm          |  7 +++++--
 code/modules/jobs/job_types/job.dm            | 13 +++---------
 .../mob/living/carbon/human/human_defines.dm  |  1 -
 hyperstation/code/modules/economy/account.dm  | 21 ++++++++++++-------
 hyperstation/code/obj/economy.dm              |  3 ---
 7 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/code/controllers/subsystem/job.dm b/code/controllers/subsystem/job.dm
index 03c4b69da..3f9efb275 100644
--- a/code/controllers/subsystem/job.dm
+++ b/code/controllers/subsystem/job.dm
@@ -331,7 +331,7 @@ SUBSYSTEM_DEF(job)
 
 				if((job.title in GLOB.silly_positions) && (player.client.prefs.sillyroles == FALSE))
 					JobDebug("DO is not whitelisted, Player: [player], Job:[job.title]")
-					continue	
+					continue
 
 				if(!job.player_old_enough(player.client))
 					JobDebug("DO player not old enough, Player: [player], Job:[job.title]")
@@ -473,10 +473,10 @@ SUBSYSTEM_DEF(job)
 	//Account ID. ID is handled by human initialization
 	if(ishuman(H))
 		var/mob/living/carbon/human/wageslave = H
-		to_chat(M, "<b><span class='big'>Your account ID is [wageslave.account_id]</span></b>")
-		to_chat(M, "<b><span class='notice'>You do not have a pin, can set your pin at an ATM.</b>")
-		if(H.mind)
-			H.mind.memory += "Your account ID is [wageslave.account_id].<BR>"
+		if(wageslave.wear_id)
+			var/obj/item/card/id/id_card = wageslave.wear_id
+			to_chat(M, "<b><span class='big'>Your account ID is [id_card.registered_account.account_id]</span></b>")
+			to_chat(M, "<b><span class='notice'>You do not have a pin, can set your pin at an ATM.</b>")
 
 	return H
 
diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm
index 99b7c577c..b005761b1 100644
--- a/code/game/machinery/computer/card.dm
+++ b/code/game/machinery/computer/card.dm
@@ -255,7 +255,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
 	else if(mode == 4)
 		dat += {"<a href='?src=[REF(src)];choice=return'>Return</a>
 		<table><tr><td style='width:25%'><b>Bank Accounts</b></td><td style='width:25%'></td></tr>"}
-		for(var/datum/bank_account/account in SSeconomy.bank_accounts)
+		for(var/datum/bank_account/account as anything in SSeconomy.bank_accounts)
 			dat += {"<td>[account.account_holder] - [account.account_id]"}
 			dat += "<a href='?src=[REF(src)];choice=bankassign;assign_bank=[REF(account)]'>Assign to ID</a></td>"
 			dat += "</td><tr>"
diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm
index 8a9f62229..dd30eb26e 100644
--- a/code/game/objects/items/cards_ids.dm
+++ b/code/game/objects/items/cards_ids.dm
@@ -171,10 +171,10 @@
 	var/registered_name = null // The name registered_name on the card
 	var/assignment = null
 	var/access_txt // mapping aid
-	var/datum/bank_account/registered_account
 	var/uses_overlays = TRUE
 	var/uses_assignment = TRUE
 	var/icon/cached_flat_icon
+	var/datum/bank_account/registered_account
 
 /obj/item/card/id/Initialize(mapload)
 	. = ..()
@@ -200,6 +200,9 @@
 	if(mining_points)
 		. += "There's [mining_points] mining equipment redemption point\s loaded onto this card."
 
+/obj/item/card/id/proc/create_bank_account(owner, job_assignment)
+	registered_account = new/datum/bank_account(owner, job_assignment, src)
+
 /obj/item/card/id/GetAccess()
 	return access
 
@@ -643,7 +646,7 @@
 	icon_state = "retrosci"
 	uses_overlays = FALSE
 	uses_assignment = FALSE
-	
+
 /obj/item/card/id/away/snowdin/med
 	name = "Arctic Station Doctor's ID card"
 	desc = "A faded Arctic Station ID card. You can make out the rank \"Doctor\"."
diff --git a/code/modules/jobs/job_types/job.dm b/code/modules/jobs/job_types/job.dm
index eadf53fdc..13a9f7338 100644
--- a/code/modules/jobs/job_types/job.dm
+++ b/code/modules/jobs/job_types/job.dm
@@ -119,7 +119,7 @@
 
 /// Generates a bank account for the person who's getting this job datum
 /datum/job/proc/generate_bank_account(mob/living/carbon/human/reciever)
-	return new/datum/bank_account(reciever, src)
+	return
 
 /datum/job/proc/get_access()
 	if(!config)	//Needed for robots.
@@ -246,15 +246,8 @@
 		else
 			C.update_label()
 
-		for(var/datum/bank_account/account as anything in SSeconomy.bank_accounts)
-			if(account.account_id == H.account_id)
-				C.registered_account = account
-				account.bank_cards += C
-									//Todo: remove bank_cards, have accounts for everyone who knows the pin to an ID. monkey go ook ook (he's rich)
-									//one card should have one account, sorta like how real cards work
-									//ping cyanosis if bank_cards is still here
-				account.associated_id = C	//Also make this better to work with
-				break
+		C.create_bank_account(H, J)
+
 		H.sec_hud_set_ID()
 
 	var/obj/item/pda/PDA = H.get_item_by_slot(pda_slot)
diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm
index 486e6583c..7225f0c28 100644
--- a/code/modules/mob/living/carbon/human/human_defines.dm
+++ b/code/modules/mob/living/carbon/human/human_defines.dm
@@ -79,6 +79,5 @@
 	var/static/list/can_ride_typecache = typecacheof(list(/mob/living/carbon/human, /mob/living/simple_animal/slime, /mob/living/simple_animal/parrot))
 	var/lastpuke = 0
 	var/last_fire_update
-	var/account_id
 	can_be_held = "micro"
 	appearance_flags = KEEP_TOGETHER|TILE_BOUND|PIXEL_SCALE|LONG_GLIDE
\ No newline at end of file
diff --git a/hyperstation/code/modules/economy/account.dm b/hyperstation/code/modules/economy/account.dm
index 2caab9c8f..a244ed0eb 100644
--- a/hyperstation/code/modules/economy/account.dm
+++ b/hyperstation/code/modules/economy/account.dm
@@ -1,17 +1,24 @@
 /datum/bank_account
+	/// The name of whoever owns this account
 	var/account_holder = "Some pleboid"
+	/// The balance, in credits!
 	var/balance = 0
-	var/account_pin = 0
-	var/datum/job/account_job
-	var/obj/item/card/id/associated_id
-	var/list/bank_cards = list()
-	var/account_id = 1
+	/// Fluff for the ID of this card. Purely cosmetic, but unique for every account
+	var/account_id = 0
+	/// The pin number that the owner wanted. Not set by default, so anyone can just steal your ID if you don't remember to set it
+	var/account_pin
+	/// The base amount of pay you get per paycheck
 	var/base_pay = 60
+	/// The linked job datum for this bank account, for calculating unique base payment for each job
+	var/datum/job/account_job
+	/// The associated ID, for letting the card-holder know when a paycheck is processed
+	var/obj/item/card/id/associated_id
 
-/datum/bank_account/New(mob/living/carbon/human/new_holder, datum/job/job)
+/datum/bank_account/New(mob/living/carbon/human/new_holder, datum/job/job, obj/item/card/id/id_card)
 	account_holder = new_holder.real_name
 	account_job = job
-	new_holder.account_id = account_id = rand(111111,999999)
+	associated_id = id_card
+	account_id = rand(111111,999999)
 
 	if(!SSeconomy || !SSeconomy.initialized)
 		stack_trace("A new bank account was made without the economy subsystem being initialized first. If this is an issue, change the subsystem's init_order.")
diff --git a/hyperstation/code/obj/economy.dm b/hyperstation/code/obj/economy.dm
index 2e438ef73..6ee1ece2e 100644
--- a/hyperstation/code/obj/economy.dm
+++ b/hyperstation/code/obj/economy.dm
@@ -15,9 +15,6 @@
 	resistance_flags = FIRE_PROOF
 	var/obj/item/card/held_card
 	var/user = ""
-	light_power = 0
-	light_range = 7
-	light_color = "#ff3232"
 	var/pin = 0
 
 /obj/machinery/atm/ui_interact(mob/user)

From eed83f9e8c04d173aaee90ec6925506ee76ce9e3 Mon Sep 17 00:00:00 2001
From: DragonTrance <dylan661993@gmail.com>
Date: Wed, 8 Jun 2022 17:58:48 -0400
Subject: [PATCH 07/19] remove todo

---
 code/controllers/subsystem/job.dm  |  2 +-
 code/modules/jobs/job_types/job.dm | 11 ++---------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/code/controllers/subsystem/job.dm b/code/controllers/subsystem/job.dm
index 3f9efb275..e53f550ac 100644
--- a/code/controllers/subsystem/job.dm
+++ b/code/controllers/subsystem/job.dm
@@ -470,7 +470,7 @@ SUBSYSTEM_DEF(job)
 
 		job.after_spawn(H, M, joined_late)
 
-	//Account ID. ID is handled by human initialization
+	//Account ID. ID is handled by outfit initialization
 	if(ishuman(H))
 		var/mob/living/carbon/human/wageslave = H
 		if(wageslave.wear_id)
diff --git a/code/modules/jobs/job_types/job.dm b/code/modules/jobs/job_types/job.dm
index 13a9f7338..1b07a8c75 100644
--- a/code/modules/jobs/job_types/job.dm
+++ b/code/modules/jobs/job_types/job.dm
@@ -106,20 +106,13 @@
 	//Equip the rest of the gear
 	H.dna.species.before_equip_job(src, H, visualsOnly)
 
-	if(!visualsOnly)
-		generate_bank_account(H) //TODO: accounts assigned to IDs. makes this less ugly
-
 	if(outfit_override || outfit)
 		H.equipOutfit(outfit_override ? outfit_override : outfit, visualsOnly)
 
-	if(!visualsOnly && announce)
-		announce(H)
-
 	H.dna.species.after_equip_job(src, H, visualsOnly)
 
-/// Generates a bank account for the person who's getting this job datum
-/datum/job/proc/generate_bank_account(mob/living/carbon/human/reciever)
-	return
+	if(!visualsOnly && announce)
+		announce(H)
 
 /datum/job/proc/get_access()
 	if(!config)	//Needed for robots.

From a256ef54c0137bb5d5e666c925a45c1d7ea8a301 Mon Sep 17 00:00:00 2001
From: DragonTrance <dylan661993@gmail.com>
Date: Wed, 8 Jun 2022 18:38:41 -0400
Subject: [PATCH 08/19] changes the price of everything to scale w/ pay

---
 code/__DEFINES/economy.dm                     | 12 +++++++++++
 code/game/objects/items/cigs_lighters.dm      |  2 +-
 code/game/objects/items/mesmetron.dm          |  2 +-
 code/game/objects/items/stacks/cash.dm        |  2 +-
 code/game/objects/items/storage/belt.dm       |  2 +-
 code/game/objects/items/storage/boxes.dm      |  4 ++--
 code/game/objects/items/storage/fancy.dm      |  8 ++++----
 code/game/objects/items/tools/weldingtool.dm  |  2 +-
 code/modules/clothing/gloves/color.dm         |  6 +++---
 code/modules/clothing/head/jobs.dm            |  2 +-
 code/modules/clothing/masks/hailer.dm         |  2 +-
 code/modules/clothing/neck/_neck.dm           |  2 +-
 code/modules/clothing/shoes/miscellaneous.dm  |  2 +-
 code/modules/clothing/suits/jobs.dm           |  2 +-
 code/modules/clothing/suits/miscellaneous.dm  |  2 +-
 code/modules/clothing/under/jobs/civilian.dm  |  2 +-
 code/modules/clothing/under/jobs/security.dm  |  6 +++---
 code/modules/food_and_drinks/drinks/drinks.dm | 14 ++++++-------
 .../food_and_drinks/drinks/drinks/bottle.dm   |  2 +-
 .../drinks/drinks/drinkingglass.dm            |  2 +-
 .../modules/food_and_drinks/food/condiment.dm |  2 +-
 .../food_and_drinks/food/snacks_other.dm      |  4 ++--
 .../food_and_drinks/food/snacks_vend.dm       | 20 +++++++++----------
 code/modules/jobs/job_types/job.dm            |  2 +-
 .../reagents/reagent_containers/glass.dm      |  2 +-
 .../reagents/reagent_containers/pill.dm       |  6 +++---
 .../code/controllers/subsystem/economy.dm     |  2 +-
 .../code/game/objects/items/cosmetics.dm      |  2 +-
 .../code/game/objects/items/lovedice.dm       |  4 ++--
 hyperstation/code/modules/economy/account.dm  |  3 ++-
 hyperstation/code/obj/condom.dm               |  2 +-
 hyperstation/code/obj/fleshlight.dm           | 18 ++++++++---------
 hyperstation/code/obj/kinkyclothes.dm         |  8 ++++----
 hyperstation/code/obj/rope.dm                 |  2 +-
 hyperstation/code/obj/sounding.dm             |  2 +-
 hyperstation/code/obj/vibrator.dm             |  2 +-
 .../items/devices/radio/shockcollar.dm        |  2 +-
 tgstation.dme                                 |  1 +
 38 files changed, 88 insertions(+), 74 deletions(-)
 create mode 100644 code/__DEFINES/economy.dm

diff --git a/code/__DEFINES/economy.dm b/code/__DEFINES/economy.dm
new file mode 100644
index 000000000..c00b4d593
--- /dev/null
+++ b/code/__DEFINES/economy.dm
@@ -0,0 +1,12 @@
+#define BASEPAY_ASSISTANT 1
+#define BASEPAY_ROOKIE 1
+#define BASEPAY_DEFAULT 1.1
+#define BASEPAY_COMMAND 1.25
+#define BASEPAY_CAPTAIN 1.5
+
+
+#define PRICE_BASE		(FLOOR(BASEPAY_ASSISTANT * 16, 1))
+#define PRICE_LOW		(FLOOR(PRICE_BASE * 0.5, 1))
+#define PRICE_HIGH		(FLOOR(PRICE_BASE * 2, 1))
+#define PRICE_EROTICA	(FLOOR(PRICE_HIGH * 1.15, 1))
+#define PRICE_EXPENSIVE	(FLOOR(PRICE_HIGH * 1.5), 1)
diff --git a/code/game/objects/items/cigs_lighters.dm b/code/game/objects/items/cigs_lighters.dm
index 135781f1c..9e239420c 100644
--- a/code/game/objects/items/cigs_lighters.dm
+++ b/code/game/objects/items/cigs_lighters.dm
@@ -505,7 +505,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	w_class = WEIGHT_CLASS_TINY
 	flags_1 = CONDUCT_1
 	slot_flags = ITEM_SLOT_BELT
-	price = 1
+	price = PRICE_LOW * 0.5
 	var/lit = 0
 	var/fancy = TRUE
 	var/overlay_state
diff --git a/code/game/objects/items/mesmetron.dm b/code/game/objects/items/mesmetron.dm
index 05eb013fa..b42ddb356 100644
--- a/code/game/objects/items/mesmetron.dm
+++ b/code/game/objects/items/mesmetron.dm
@@ -9,7 +9,7 @@
 	throw_speed = 3
 	var/mob/living/carbon/subject = null
 	var/closed = FALSE
-	price = 10
+	price = PRICE_EROTICA
 
 
 //Hypnotize someone
diff --git a/code/game/objects/items/stacks/cash.dm b/code/game/objects/items/stacks/cash.dm
index e7de4e6a1..8b9f89ed1 100644
--- a/code/game/objects/items/stacks/cash.dm
+++ b/code/game/objects/items/stacks/cash.dm
@@ -20,7 +20,7 @@
 
 /obj/item/stack/spacecash/proc/update_desc()
 	var/total_worth = amount*value
-	desc = "A outdated form of currency, It's worth [total_worth] credit[( total_worth > 1 ) ? "s" : ""]"
+	desc = "An outdated form of currency, It's worth [total_worth] credit[( total_worth > 1 ) ? "s" : ""]"
 
 
 /obj/item/stack/spacecash/merge(obj/item/stack/S)
diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm
index 0196daee0..4cdc7b160 100644
--- a/code/game/objects/items/storage/belt.dm
+++ b/code/game/objects/items/storage/belt.dm
@@ -240,7 +240,7 @@
 	desc = "Holds a variety of gear for \"alternative\" peacekeeping."
 	icon_state = "slutbelt"
 	item_state = "slut"
-	price = 5
+	price = PRICE_EROTICA
 
 obj/item/storage/belt/slut/ComponentInitialize()
 	. = ..()
diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm
index 899617fd1..03dffc430 100644
--- a/code/game/objects/items/storage/boxes.dm
+++ b/code/game/objects/items/storage/boxes.dm
@@ -418,7 +418,7 @@
 	desc = "<B>Instructions:</B> <I>Heat in microwave. Product will cool if not eaten within seven minutes.</I>"
 	icon_state = "donkpocketbox"
 	illustration=null
-	price = 10
+	price = PRICE_EXPENSIVE * 0.85
 	var/donktype = /obj/item/reagent_containers/food/snacks/donkpocket
 	var/warmtype = /obj/item/reagent_containers/food/snacks/donkpocket/warm
 
@@ -675,7 +675,7 @@
 	item_state = "zippo"
 	w_class = WEIGHT_CLASS_TINY
 	slot_flags = ITEM_SLOT_BELT
-	price = 2
+	price = PRICE_LOW * 0.5
 	drop_sound = 'sound/items/handling/matchbox_drop.ogg'
 	pickup_sound =  'sound/items/handling/matchbox_pickup.ogg'
 
diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm
index 2d1b0b57a..6f533b245 100644
--- a/code/game/objects/items/storage/fancy.dm
+++ b/code/game/objects/items/storage/fancy.dm
@@ -136,7 +136,7 @@
 	slot_flags = ITEM_SLOT_BELT
 	icon_type = "cigarette"
 	spawn_type = /obj/item/clothing/mask/cigarette/space_cigarette
-	price = 5
+	price = PRICE_LOW * 0.5
 
 /obj/item/storage/fancy/cigarettes/ComponentInitialize()
 	. = ..()
@@ -231,7 +231,7 @@
 	desc = "Smoked by the truly robust."
 	icon_state = "robustg"
 	spawn_type = /obj/item/clothing/mask/cigarette/robustgold
-	price = 6
+	price = PRICE_LOW * 0.75
 
 /obj/item/storage/fancy/cigarettes/cigpack_carp
 	name = "\improper Carp Classic packet"
@@ -283,7 +283,7 @@
 	icon_state = "cig_paper_pack"
 	icon_type = "rolling paper"
 	spawn_type = /obj/item/rollingpaper
-	price = 2
+	price = PRICE_LOW * 0.25
 
 /obj/item/storage/fancy/rollingpapers/ComponentInitialize()
 	. = ..()
@@ -308,7 +308,7 @@
 	w_class = WEIGHT_CLASS_NORMAL
 	icon_type = "premium cigar"
 	spawn_type = /obj/item/clothing/mask/cigarette/cigar
-	price = 8
+	price = PRICE_BASE
 
 /obj/item/storage/fancy/cigarettes/cigars/ComponentInitialize()
 	. = ..()
diff --git a/code/game/objects/items/tools/weldingtool.dm b/code/game/objects/items/tools/weldingtool.dm
index 9b43af283..50b5f4754 100644
--- a/code/game/objects/items/tools/weldingtool.dm
+++ b/code/game/objects/items/tools/weldingtool.dm
@@ -344,7 +344,7 @@
 	item_state = "upindwelder"
 	max_fuel = 80
 	materials = list(MAT_METAL=70, MAT_GLASS=120)
-	price = 10
+	price = PRICE_EXPENSIVE * 1.1
 
 /obj/item/weldingtool/experimental
 	name = "experimental welding tool"
diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm
index 9b82fc1e3..b79b77440 100644
--- a/code/modules/clothing/gloves/color.dm
+++ b/code/modules/clothing/gloves/color.dm
@@ -8,7 +8,7 @@
 	item_color="yellow"
 	resistance_flags = NONE
 	var/can_be_cut = 1
-	price = 10
+	price = PRICE_EXPENSIVE
 
 /obj/item/clothing/gloves/color/yellow/ce //funky looking, basically combat gloves
 	desc = "Special Insulated gloves with pricy thermal shielding normally only found in combat gloves."
@@ -34,7 +34,7 @@
 	item_color="yellow"
 	resistance_flags = NONE
 	var/can_be_cut = 1
-	price = 5
+	price = PRICE_LOW * 0.5
 
 /obj/item/clothing/gloves/color/fyellow/New()
 	..()
@@ -129,7 +129,7 @@
 	siemens_coefficient = 0
 	permeability_coefficient = 0.05
 	resistance_flags = NONE
-	price = 12
+	price = PRICE_EXPENSIVE
 
 /obj/item/clothing/gloves/color/rainbow
 	name = "rainbow gloves"
diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm
index 3acdb8335..de3a7d5af 100644
--- a/code/modules/clothing/head/jobs.dm
+++ b/code/modules/clothing/head/jobs.dm
@@ -260,7 +260,7 @@
 	name = "security's bitch beret"
 	desc = "A softer beret with the word 'BITCH' embroidered on it in pink thread."
 	icon_state = "bitchberet"
-	price = 5
+	price = PRICE_LOW * 1.5
 
 //Curator
 /obj/item/clothing/head/fedora/curator
diff --git a/code/modules/clothing/masks/hailer.dm b/code/modules/clothing/masks/hailer.dm
index 5d53688cd..79864797a 100644
--- a/code/modules/clothing/masks/hailer.dm
+++ b/code/modules/clothing/masks/hailer.dm
@@ -45,7 +45,7 @@
 	item_state = "sluthailer"
 	aggressiveness = 0 //can't have your pets being mean!
 	actions_types = list(/datum/action/item_action/halt)
-	price = 5
+	price = PRICE_EROTICA
 
 /obj/item/clothing/mask/gas/sechailer/slut/attack_hand(mob/user)
 	if(iscarbon(user))
diff --git a/code/modules/clothing/neck/_neck.dm b/code/modules/clothing/neck/_neck.dm
index 3f7909b1e..98a9ea537 100644
--- a/code/modules/clothing/neck/_neck.dm
+++ b/code/modules/clothing/neck/_neck.dm
@@ -302,4 +302,4 @@
 	icon = 'icons/obj/clothing/neck.dmi'
 	icon_state = "bling"
 	item_color = "bling"
-	price = 30
\ No newline at end of file
+	price = PRICE_EXPENSIVE
\ No newline at end of file
diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm
index 13eb8eacc..069dda542 100644
--- a/code/modules/clothing/shoes/miscellaneous.dm
+++ b/code/modules/clothing/shoes/miscellaneous.dm
@@ -137,7 +137,7 @@
 	desc = "A pair of knee-high jackboots, complete with heels. All style, all the time."
 	icon_state = "jackboots-tall"
 	item_state = "jackboots-tall"
-	price = 5
+	price = PRICE_BASE * 0.75
 
 /obj/item/clothing/shoes/jackboots/fast
 	slowdown = -1
diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm
index e193aa3e4..8eca34714 100644
--- a/code/modules/clothing/suits/jobs.dm
+++ b/code/modules/clothing/suits/jobs.dm
@@ -169,7 +169,7 @@
 	cold_protection = CHEST|LEGS|ARMS
 	heat_protection = CHEST|LEGS|ARMS
 	mutantrace_variation = NO_MUTANTRACE_VARIATION //you don't need it
-	price = 5
+	price = PRICE_HIGH
 
 //Surgeon
 /obj/item/clothing/suit/apron/surgical
diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm
index 6e002119b..60314ead6 100644
--- a/code/modules/clothing/suits/miscellaneous.dm
+++ b/code/modules/clothing/suits/miscellaneous.dm
@@ -710,7 +710,7 @@
 	icon_state = "coatsecuritypink"
 	item_state = "coatsecuritypink"
 	hoodtype = /obj/item/clothing/head/hooded/winterhood/security/pink
-	price = 5
+	price = PRICE_LOW
 
 /obj/item/clothing/suit/hooded/wintercoat/security/Initialize()
 	. = ..()
diff --git a/code/modules/clothing/under/jobs/civilian.dm b/code/modules/clothing/under/jobs/civilian.dm
index 6b5eea68b..62c12768a 100644
--- a/code/modules/clothing/under/jobs/civilian.dm
+++ b/code/modules/clothing/under/jobs/civilian.dm
@@ -381,7 +381,7 @@
 	item_state = "b_suit"
 	item_color = "galaxy_blue"
 	can_adjust = FALSE
-	price = 10
+	price = PRICE_EXPENSIVE
 
 /obj/item/clothing/under/lawyer/galaxy_red
 	name = "\improper Pulsar Gonne"
diff --git a/code/modules/clothing/under/jobs/security.dm b/code/modules/clothing/under/jobs/security.dm
index 722c71640..916b012cb 100644
--- a/code/modules/clothing/under/jobs/security.dm
+++ b/code/modules/clothing/under/jobs/security.dm
@@ -30,7 +30,7 @@
 	icon_state = "rsecuritypink"
 	item_state = "r_suit"
 	item_color = "rsecuritypink"
-	price = 3
+	price = PRICE_LOW
 /obj/item/clothing/under/rank/security/skirt
 	name = "security jumpskirt"
 	desc = "A \"tactical\" security jumpsuit with the legs replaced by a skirt."
@@ -47,7 +47,7 @@
 	item_state = "secslutskirt"
 	item_color = null //i dont understand what item_color even is, apparently setting it to null means it won't change color in a washing machine?
 	mutantrace_variation = NO_MUTANTRACE_VARIATION //look at the first two comments in vg_under.dm
-	price = 3
+	price = PRICE_LOW
 /obj/item/clothing/under/rank/security/skirt/slut/pink
 	desc = "A \"\"\"tactical\"\"\" security jumpsuit with the legs replaced by a skirt. No matter how you adjust it, it always feels a little too small. This one seems to have an experimental color scheme."
 	icon_state = "secslutskirtpink"
@@ -61,7 +61,7 @@
 	can_adjust = FALSE
 	body_parts_covered = CHEST|GROIN
 	mutantrace_variation = NO_MUTANTRACE_VARIATION
-	price = 5
+	price = PRICE_EROTICA
 
 
 /obj/item/clothing/under/rank/warden
diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm
index 7cb5e3df4..85c41cb8a 100644
--- a/code/modules/food_and_drinks/drinks/drinks.dm
+++ b/code/modules/food_and_drinks/drinks/drinks.dm
@@ -217,7 +217,7 @@
 	resistance_flags = FREEZE_PROOF
 	isGlass = FALSE
 	foodtype = BREAKFAST
-	price = 2
+	price = PRICE_LOW
 
 //Used by MREs
 /obj/item/reagent_containers/food/drinks/coffee/type2
@@ -241,7 +241,7 @@
 	icon_state = "tea"
 	item_state = "coffee"
 	spillable = TRUE
-	price = 2
+	price = PRICE_LOW
 
 /* Doesn't exist lol
 /datum/chemical_reaction/catnip_tea
@@ -252,7 +252,7 @@
 */
 
 /obj/item/reagent_containers/food/drinks/mug/on_reagent_change(changetype)
-	cut_overlays()    
+	cut_overlays()
 	if(reagents.total_volume)
 		var/mutable_appearance/MA = mutable_appearance(icon,"mugoverlay")
 		MA.color = mix_color_from_reagents(reagents.reagent_list)
@@ -265,7 +265,7 @@
 	icon_state = "tea"
 	desc = "An insult to Duke Purple is an insult to the Space Queen! Any proper gentleman will fight you, if you sully this tea."
 	list_reagents = list(/datum/reagent/consumable/tea = 30)
-	price = 2
+	price = PRICE_LOW
 
 /obj/item/reagent_containers/food/drinks/mug/coco
 	name = "Dutch hot coco"
@@ -284,7 +284,7 @@
 	list_reagents = list(/datum/reagent/consumable/dry_ramen = 30)
 	foodtype = GRAIN
 	isGlass = FALSE
-	price = 3
+	price = PRICE_BASE * 0.75
 
 /obj/item/reagent_containers/food/drinks/beer
 	name = "space beer"
@@ -423,7 +423,7 @@
 	reagent_flags = NONE
 	spillable = FALSE
 	isGlass = FALSE
-	price = 2
+	price = PRICE_LOW
 
 /obj/item/reagent_containers/food/drinks/soda_cans/suicide_act(mob/living/carbon/user)
 	user.visible_message("<span class='suicide'>[user] is trying to eat \the [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
@@ -548,4 +548,4 @@
 	icon_state = "menergy"
 	list_reagents = list(/datum/reagent/consumable/monkey_energy = 50)
 	foodtype = SUGAR
-	price = 3
+	price = PRICE_HIGH * 1.25
diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm
index 623179f8f..70e139d3b 100644
--- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm
+++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm
@@ -416,7 +416,7 @@
 	isGlass = FALSE
 	list_reagents = list(/datum/reagent/consumable/cream = 100)
 	foodtype = DAIRY
-	price = 3
+	price = PRICE_LOW
 
 /obj/item/reagent_containers/food/drinks/bottle/tomatojuice
 	name = "tomato juice"
diff --git a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm b/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm
index 95b3e8dbc..7ad3baf0c 100644
--- a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm
+++ b/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm
@@ -93,7 +93,7 @@
 /obj/item/reagent_containers/food/drinks/drinkingglass/filled/nuka_cola
 	name = "Nuka Cola"
 	list_reagents = list(/datum/reagent/consumable/nuka_cola = 50)
-	price = 7
+	price = PRICE_BASE * 1.1
 
 /obj/item/reagent_containers/food/drinks/drinkingglass/filled/syndicatebomb
 	name = "Syndicat Bomb"
diff --git a/code/modules/food_and_drinks/food/condiment.dm b/code/modules/food_and_drinks/food/condiment.dm
index 69d943681..2693c192d 100644
--- a/code/modules/food_and_drinks/food/condiment.dm
+++ b/code/modules/food_and_drinks/food/condiment.dm
@@ -186,7 +186,7 @@
 	righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi'
 	list_reagents = list(/datum/reagent/consumable/milk = 50)
 	possible_states = list()
-	price = 5
+	price = PRICE_LOW
 
 /obj/item/reagent_containers/food/condiment/flour
 	name = "flour sack"
diff --git a/code/modules/food_and_drinks/food/snacks_other.dm b/code/modules/food_and_drinks/food/snacks_other.dm
index 30f12279c..435326ea0 100644
--- a/code/modules/food_and_drinks/food/snacks_other.dm
+++ b/code/modules/food_and_drinks/food/snacks_other.dm
@@ -59,7 +59,7 @@
 	tastes = list("chocolate" = 1)
 	foodtype = JUNKFOOD | SUGAR
 	dunkable = TRUE
-	price = 2
+	price = PRICE_LOW * 0.5
 
 
 /obj/item/reagent_containers/food/snacks/hugemushroomslice
@@ -663,4 +663,4 @@
 	else if (icon_state != "marshmallowrburned")
 		icon_state = "marshmallowburned"
 		desc = "[initial(desc)] It looks just right for eating!"
-		tastes = list("marshmallow" = 1, "cream" = 1) 
+		tastes = list("marshmallow" = 1, "cream" = 1)
diff --git a/code/modules/food_and_drinks/food/snacks_vend.dm b/code/modules/food_and_drinks/food/snacks_vend.dm
index e96e92d87..797a4f4a7 100644
--- a/code/modules/food_and_drinks/food/snacks_vend.dm
+++ b/code/modules/food_and_drinks/food/snacks_vend.dm
@@ -12,7 +12,7 @@
 	filling_color = "#D2691E"
 	tastes = list("candy" = 1)
 	foodtype = JUNKFOOD | SUGAR
-	price = 2
+	price = PRICE_LOW * 0.5
 
 /obj/item/reagent_containers/food/snacks/sosjerky
 	name = "\improper Scaredy's Private Reserve Beef Jerky"
@@ -24,7 +24,7 @@
 	filling_color = "#8B0000"
 	tastes = list("dried meat" = 1)
 	foodtype = JUNKFOOD | MEAT | SUGAR
-	price = 3
+	price = PRICE_LOW * 0.75
 
 /obj/item/reagent_containers/food/snacks/sosjerky/healthy
 	name = "homemade beef jerky"
@@ -43,7 +43,7 @@
 	filling_color = "#FFD700"
 	tastes = list("salt" = 1, "crisps" = 1)
 	foodtype = JUNKFOOD | FRIED
-	price = 2
+	price = PRICE_LOW * 0.5
 
 /obj/item/reagent_containers/food/snacks/no_raisin
 	name = "4no raisins"
@@ -55,7 +55,7 @@
 	filling_color = "#8B0000"
 	tastes = list("dried raisins" = 1)
 	foodtype = JUNKFOOD | FRUIT | SUGAR
-	price = 2
+	price = PRICE_LOW * 0.5
 
 /obj/item/reagent_containers/food/snacks/no_raisin/healthy
 	name = "homemade raisins"
@@ -72,7 +72,7 @@
 	junkiness = 25
 	filling_color = "#FFD700"
 	foodtype = JUNKFOOD | GRAIN | SUGAR
-	price = 4
+	price = PRICE_LOW
 
 /obj/item/reagent_containers/food/snacks/cheesiehonkers
 	name = "cheesie honkers"
@@ -84,7 +84,7 @@
 	filling_color = "#FFD700"
 	tastes = list("cheese" = 5, "crisps" = 2)
 	foodtype = JUNKFOOD | DAIRY | SUGAR
-	price = 4
+	price = PRICE_LOW * 0.5
 
 /obj/item/reagent_containers/food/snacks/soyfood
 	name = "Soyfood"
@@ -96,7 +96,7 @@
 	filling_color = "#FFD700"
 	tastes = list("nanomachines" = 2, "soybeans" = 5)
 	foodtype = JUNKFOOD | DAIRY | GRAIN
-	price = 3
+	price = PRICE_LOW * 1.25
 
 /obj/item/reagent_containers/food/snacks/syndicake
 	name = "syndi-cakes"
@@ -107,7 +107,7 @@
 	filling_color = "#F5F5DC"
 	tastes = list("sweetness" = 3, "cake" = 1)
 	foodtype = GRAIN | FRUIT | VEGETABLES | ANTITOXIC
-	price = 5
+	price = PRICE_LOW * 1.75
 
 /obj/item/reagent_containers/food/snacks/carbonnanotube_noodles
 	name = "carbon nanotube noodles"
@@ -119,7 +119,7 @@
 	filling_color = "#FFD700"
 	tastes = list("charcoal" = 1, "spiciness" = 3, "soysauce" = 3)
 	foodtype = GRAIN | VEGETABLES
-	price = 3
+	price = PRICE_LOW * 1.75
 
 /obj/item/reagent_containers/food/snacks/bird_seed
 	name = "Sunflower Seeds"
@@ -130,4 +130,4 @@
 	filling_color = "#b497162f"
 	tastes = list("olives" = 1, "Nuts" = 3, "spice" = 2)
 	foodtype = GRAIN | VEGETABLES
-	price = 3
\ No newline at end of file
+	price = PRICE_LOW
\ No newline at end of file
diff --git a/code/modules/jobs/job_types/job.dm b/code/modules/jobs/job_types/job.dm
index 1b07a8c75..b44914b71 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 = 0.7
+	var/base_paycheck_multiplier = 1
 
 	var/override_roundstart_spawn = null		//Where the player spawns at roundstart if defined
 
diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm
index 0a577dc44..8183a4688 100644
--- a/code/modules/reagents/reagent_containers/glass.dm
+++ b/code/modules/reagents/reagent_containers/glass.dm
@@ -336,7 +336,7 @@
 	volume = 50
 	amount_per_transfer_from_this = 10
 	container_HP = 1
-	price = 1
+	price = PRICE_LOW
 
 /obj/item/reagent_containers/glass/beaker/waterbottle/Initialize()
 	beaker_weakness_bitflag |= TEMP_WEAK
diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm
index 9a7404a98..712b4c12d 100644
--- a/code/modules/reagents/reagent_containers/pill.dm
+++ b/code/modules/reagents/reagent_containers/pill.dm
@@ -269,17 +269,17 @@
 /obj/item/reagent_containers/pill/penis_enlargement
 	name = "penis enlargement pill"
 	list_reagents = list(/datum/reagent/fermi/penis_enlarger = 10)
-	price = 4
+	price = PRICE_LOW
 	icon_state = "pill_lewd"
 
 /obj/item/reagent_containers/pill/breast_enlargement
 	name = "breast enlargement pill"
 	list_reagents = list(/datum/reagent/fermi/breast_enlarger = 10)
-	price = 4
+	price = PRICE_LOW
 	icon_state = "pill_lewd"
 
 /obj/item/reagent_containers/pill/butt_enlargement
 	name = "butt enlargement pill"
 	list_reagents = list(/datum/reagent/fermi/butt_enlarger = 10)
-	price = 4
+	price = PRICE_LOW
 	icon_state = "pill_lewd"
\ No newline at end of file
diff --git a/hyperstation/code/controllers/subsystem/economy.dm b/hyperstation/code/controllers/subsystem/economy.dm
index ca1fa5201..157a7ac3f 100644
--- a/hyperstation/code/controllers/subsystem/economy.dm
+++ b/hyperstation/code/controllers/subsystem/economy.dm
@@ -20,4 +20,4 @@ SUBSYSTEM_DEF(economy)
  * job datums if the respective one is null. You can pass zero arguments here and you'd get the "default" amount of a paycheck.
  */
 /datum/controller/subsystem/economy/proc/GetPaycheck(datum/bank_account/account, datum/job/job, multiplier=1)
-	return account:base_pay * job:base_paycheck_multiplier * multiplier
+	return FLOOR(account:base_pay * job:base_paycheck_multiplier * multiplier, 1)
diff --git a/hyperstation/code/game/objects/items/cosmetics.dm b/hyperstation/code/game/objects/items/cosmetics.dm
index e30267472..4ddff571b 100644
--- a/hyperstation/code/game/objects/items/cosmetics.dm
+++ b/hyperstation/code/game/objects/items/cosmetics.dm
@@ -8,7 +8,7 @@
 	item_state = "nailpolish"
 	w_class = WEIGHT_CLASS_SMALL
 	var/paint = "black"
-	price = 5
+	price = PRICE_LOW * 0.5
 	var/mutable_appearance/bottle //show the colour on the bottle.
 
 /obj/item/nailpolish/red
diff --git a/hyperstation/code/game/objects/items/lovedice.dm b/hyperstation/code/game/objects/items/lovedice.dm
index 2048fce55..a3d36b163 100644
--- a/hyperstation/code/game/objects/items/lovedice.dm
+++ b/hyperstation/code/game/objects/items/lovedice.dm
@@ -1,4 +1,4 @@
-/* 
+/*
 lover's dice: based off a really funny yakuza gif i saw on tumblr years ago
 these give suggestions for sex acts to perform. it's stupid but fun.
 
@@ -12,7 +12,7 @@ sarcoph mar 2022
 	desc = "Contains all the intimate ideas you'll ever need. A game that everyone wins!"
 	icon = 'hyperstation/icons/obj/toy.dmi'
 	icon_state = "lovedicebag"
-	price = 1
+	price = PRICE_LOW
 
 /obj/item/storage/pill_bottle/lovedice/Initialize()
 	. = ..()
diff --git a/hyperstation/code/modules/economy/account.dm b/hyperstation/code/modules/economy/account.dm
index a244ed0eb..4edb3d39e 100644
--- a/hyperstation/code/modules/economy/account.dm
+++ b/hyperstation/code/modules/economy/account.dm
@@ -8,7 +8,8 @@
 	/// The pin number that the owner wanted. Not set by default, so anyone can just steal your ID if you don't remember to set it
 	var/account_pin
 	/// The base amount of pay you get per paycheck
-	var/base_pay = 60
+	/// At the moment of documenting this, the base pay is 80
+	var/base_pay = PRICE_BASE * 5
 	/// The linked job datum for this bank account, for calculating unique base payment for each job
 	var/datum/job/account_job
 	/// The associated ID, for letting the card-holder know when a paycheck is processed
diff --git a/hyperstation/code/obj/condom.dm b/hyperstation/code/obj/condom.dm
index 2c3122fe2..1e3aeb8f3 100644
--- a/hyperstation/code/obj/condom.dm
+++ b/hyperstation/code/obj/condom.dm
@@ -9,7 +9,7 @@
 	icon_state 			= "b_condom_wrapped"
 	var/unwrapped			= 0
 	w_class = WEIGHT_CLASS_TINY
-	price = 1
+	price = PRICE_LOW
 
 obj/item/condom/Initialize()
 	create_reagents(300, DRAWABLE|NO_REACT)
diff --git a/hyperstation/code/obj/fleshlight.dm b/hyperstation/code/obj/fleshlight.dm
index 421cfb8f6..bd1b1d8dd 100644
--- a/hyperstation/code/obj/fleshlight.dm
+++ b/hyperstation/code/obj/fleshlight.dm
@@ -11,7 +11,7 @@
 	item_state = "fleshlight"
 	w_class = WEIGHT_CLASS_SMALL
 	var/sleevecolor = "#ffcbd4" //pink
-	price = 8
+	price = PRICE_EROTICA * 0.75
 	var/mutable_appearance/sleeve
 	var/inuse = 0
 
@@ -81,7 +81,7 @@
 	var/partnercolor = "#ffcbd4"
 	var/partnerbase = "normal"
 	var/partnerorgan = "portal_vag"
-	price = 20
+	price = PRICE_EROTICA
 	var/mutable_appearance/sleeve
 	var/mutable_appearance/organ
 	var/inuse = 0
@@ -96,7 +96,7 @@
 	else
 		. += "<span class='notice'>The device is paired, and awaiting input. </span>"
 
-/obj/item/portallight/attack(mob/living/carbon/user, mob/living/holder) 
+/obj/item/portallight/attack(mob/living/carbon/user, mob/living/holder)
 	if(inuse) //just to stop stacking and causing people to cum instantly
 		return
 	if(!UpdateUsability())
@@ -111,8 +111,8 @@
 	if(option == "Fuck" && !P.is_exposed())
 		to_chat(holder, "<span class='notice'>You don't see anywhere to use this on.</span>")
 		return
-	/* 
-	WARMUP START - prevents spam/instant climax 
+	/*
+	WARMUP START - prevents spam/instant climax
 	*/
 	inuse = TRUE
 	if(user != holder)
@@ -122,8 +122,8 @@
 		inuse = FALSE
 		return
 	inuse = FALSE
-	/* 
-	WARMUP END -	proceed with the action 
+	/*
+	WARMUP END -	proceed with the action
 	*/
 	switch(option)
 		if("Fuck")
@@ -140,7 +140,7 @@
 			user.adjustArousalLoss(20)
 			target.adjustArousalLoss(20)
 			target.do_jitter_animation()
-			if(target.can_orgasm() && prob(5)) 
+			if(target.can_orgasm() && prob(5))
 				target.mob_climax_outside(target_genital, spillage=target_genital.is_exposed())
 			if(user.can_orgasm())
 				var/mob/living/carbon/human/O = user
@@ -276,7 +276,7 @@
 	icon = 'hyperstation/icons/obj/fleshlight.dmi'
 	desc = "A small silver box with Silver Love Co embossed."
 	icon_state = "box"
-	price = 15
+	price = PRICE_EROTICA * 1.15
 
 // portal fleshlight box
 /obj/item/storage/box/portallight/PopulateContents()
diff --git a/hyperstation/code/obj/kinkyclothes.dm b/hyperstation/code/obj/kinkyclothes.dm
index e7be65751..1326bad33 100644
--- a/hyperstation/code/obj/kinkyclothes.dm
+++ b/hyperstation/code/obj/kinkyclothes.dm
@@ -6,14 +6,14 @@
 	icon = 'hyperstation/icons/obj/clothing/gloves.dmi'
 	alternate_worn_icon = 'hyperstation/icons/mobs/gloves.dmi'
 	mutantrace_variation = NO_MUTANTRACE_VARIATION
-	price = 5
+	price = PRICE_EROTICA * 0.75
 
 /obj/item/clothing/gloves/latexsleeves/security
 	name = "security sleeves"
 	desc = "A pair of latex sleeves, with a band of red above the elbows denoting that the wearer is part of the security team."
 	icon_state = "latexsec"
 	item_state = "latexsec"
-	price = 5
+	price = PRICE_EROTICA * 0.75
 
 /obj/item/clothing/head/dominatrixcap
 	name = "dominatrix cap"
@@ -45,7 +45,7 @@ obj/item/clothing/neck/stole
 	w_class = WEIGHT_CLASS_SMALL
 	icon_state = "stole"
 	item_state = ""	//no inhands
-	price = 3
+	price = PRICE_HIGH * 0.75
 
 obj/item/clothing/neck/stole/black
 	name = "black boa"
@@ -55,7 +55,7 @@ obj/item/clothing/neck/stole/black
 	icon_state = "stole"
 	item_state = ""	//no inhands
 	color = "#3d3d3d"
-	price = 3
+	price = PRICE_HIGH * 0.75
 
 /obj/item/clothing/suit/fluffyhalfcrop
 	name = "fluffy half-crop jacket"
diff --git a/hyperstation/code/obj/rope.dm b/hyperstation/code/obj/rope.dm
index 4e029509a..28bb84750 100644
--- a/hyperstation/code/obj/rope.dm
+++ b/hyperstation/code/obj/rope.dm
@@ -10,7 +10,7 @@
 	item_state = "rope" //This sprite is in restraints.dmi until I figure out how to refrence somewhere else
 	cuffsound = 'sound/weapons/cablecuff.ogg'
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
-	price = 2
+	price = PRICE_LOW * 1.25	//What's so expensive about a rope?
 
 /mob/living/proc/rope_add(source) //Check to see if the rope is on, and then add effects
 	var/mob/living/carbon/M = source
diff --git a/hyperstation/code/obj/sounding.dm b/hyperstation/code/obj/sounding.dm
index 08715aa38..94b8b33bf 100644
--- a/hyperstation/code/obj/sounding.dm
+++ b/hyperstation/code/obj/sounding.dm
@@ -6,7 +6,7 @@
 	icon_state 			= "sounding_wrapped"
 	var/unwrapped			= 0
 	w_class = WEIGHT_CLASS_TINY
-	price = 1
+	price = PRICE_LOW
 
 /obj/item/sounding/attack_self(mob/user)
 	if(!istype(user))
diff --git a/hyperstation/code/obj/vibrator.dm b/hyperstation/code/obj/vibrator.dm
index 40e1446e9..870b5069b 100644
--- a/hyperstation/code/obj/vibrator.dm
+++ b/hyperstation/code/obj/vibrator.dm
@@ -13,7 +13,7 @@
 	var/style = "long"
 	var/inside = FALSE
 	var/last = 0
-	price = 3
+	price = PRICE_LOW * 1.2
 
 /obj/item/electropack/vibrator/Initialize() //give the device its own code
 	. = ..()
diff --git a/modular_citadel/code/game/objects/items/devices/radio/shockcollar.dm b/modular_citadel/code/game/objects/items/devices/radio/shockcollar.dm
index 0b97815b6..440f8eba7 100644
--- a/modular_citadel/code/game/objects/items/devices/radio/shockcollar.dm
+++ b/modular_citadel/code/game/objects/items/devices/radio/shockcollar.dm
@@ -11,7 +11,7 @@
 	strip_delay = 60
 	equip_delay_other = 60
 	materials = list(MAT_METAL=5000, MAT_GLASS=2000)
-	price = 5
+	price = PRICE_HIGH
 	var/tagname = null
 
 /datum/design/electropack/shockcollar
diff --git a/tgstation.dme b/tgstation.dme
index bd40b91ac..03f7a2973 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -43,6 +43,7 @@
 #include "code\__DEFINES\cult.dm"
 #include "code\__DEFINES\diseases.dm"
 #include "code\__DEFINES\DNA.dm"
+#include "code\__DEFINES\economy.dm"
 #include "code\__DEFINES\events.dm"
 #include "code\__DEFINES\exports.dm"
 #include "code\__DEFINES\fantasy_affixes.dm"

From bd72cf382d808252237bae34f0d8f101cc5aee82 Mon Sep 17 00:00:00 2001
From: DragonTrance <dylan661993@gmail.com>
Date: Wed, 8 Jun 2022 18:46:38 -0400
Subject: [PATCH 09/19] 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
 

From 99b3c904d5c0d0f3c48bd1e4a0c59f9d34fd0527 Mon Sep 17 00:00:00 2001
From: DragonTrance <dylan661993@gmail.com>
Date: Wed, 8 Jun 2022 19:15:51 -0400
Subject: [PATCH 10/19] fixes + balancing

---
 code/__DEFINES/economy.dm                        | 10 +++++-----
 code/game/objects/items/storage/fancy.dm         |  2 +-
 code/modules/clothing/head/jobs.dm               |  2 +-
 code/modules/clothing/under/jobs/security.dm     |  2 +-
 .../modules/food_and_drinks/food/snacks_other.dm |  2 +-
 code/modules/food_and_drinks/food/snacks_vend.dm | 16 ++++++++--------
 code/modules/vending/_vending.dm                 |  2 +-
 hyperstation/code/game/objects/items/lovedice.dm |  2 +-
 hyperstation/code/obj/condom.dm                  |  2 +-
 hyperstation/code/obj/rope.dm                    |  2 +-
 hyperstation/code/obj/sounding.dm                |  2 +-
 hyperstation/code/obj/vibrator.dm                |  2 +-
 12 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/code/__DEFINES/economy.dm b/code/__DEFINES/economy.dm
index d07ef1193..eb2055e06 100644
--- a/code/__DEFINES/economy.dm
+++ b/code/__DEFINES/economy.dm
@@ -5,8 +5,8 @@
 #define BASEPAY_CAPTAIN 1.65
 
 
-#define PRICE_BASE		(FLOOR(BASEPAY_ASSISTANT * 16, 1))
-#define PRICE_LOW		(FLOOR(PRICE_BASE * 0.5, 1))
-#define PRICE_HIGH		(FLOOR(PRICE_BASE * 2, 1))
-#define PRICE_EROTICA	(FLOOR(PRICE_HIGH * 1.15, 1))
-#define PRICE_EXPENSIVE	(FLOOR(PRICE_HIGH * 1.5), 1)
+#define PRICE_BASE		(BASEPAY_ASSISTANT * 16)
+#define PRICE_LOW		(PRICE_BASE * 0.75)
+#define PRICE_HIGH		(PRICE_BASE * 2)
+#define PRICE_EROTICA	(PRICE_HIGH * 1.15)
+#define PRICE_EXPENSIVE	(PRICE_HIGH * 1.5)
diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm
index 6f533b245..8f581933f 100644
--- a/code/game/objects/items/storage/fancy.dm
+++ b/code/game/objects/items/storage/fancy.dm
@@ -231,7 +231,7 @@
 	desc = "Smoked by the truly robust."
 	icon_state = "robustg"
 	spawn_type = /obj/item/clothing/mask/cigarette/robustgold
-	price = PRICE_LOW * 0.75
+	price = PRICE_LOW * 1.25
 
 /obj/item/storage/fancy/cigarettes/cigpack_carp
 	name = "\improper Carp Classic packet"
diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm
index de3a7d5af..622a63bb6 100644
--- a/code/modules/clothing/head/jobs.dm
+++ b/code/modules/clothing/head/jobs.dm
@@ -260,7 +260,7 @@
 	name = "security's bitch beret"
 	desc = "A softer beret with the word 'BITCH' embroidered on it in pink thread."
 	icon_state = "bitchberet"
-	price = PRICE_LOW * 1.5
+	price = PRICE_BASE * 1.5
 
 //Curator
 /obj/item/clothing/head/fedora/curator
diff --git a/code/modules/clothing/under/jobs/security.dm b/code/modules/clothing/under/jobs/security.dm
index 916b012cb..20a06dedd 100644
--- a/code/modules/clothing/under/jobs/security.dm
+++ b/code/modules/clothing/under/jobs/security.dm
@@ -47,7 +47,7 @@
 	item_state = "secslutskirt"
 	item_color = null //i dont understand what item_color even is, apparently setting it to null means it won't change color in a washing machine?
 	mutantrace_variation = NO_MUTANTRACE_VARIATION //look at the first two comments in vg_under.dm
-	price = PRICE_LOW
+	price = PRICE_EROTICA
 /obj/item/clothing/under/rank/security/skirt/slut/pink
 	desc = "A \"\"\"tactical\"\"\" security jumpsuit with the legs replaced by a skirt. No matter how you adjust it, it always feels a little too small. This one seems to have an experimental color scheme."
 	icon_state = "secslutskirtpink"
diff --git a/code/modules/food_and_drinks/food/snacks_other.dm b/code/modules/food_and_drinks/food/snacks_other.dm
index 435326ea0..b83e25905 100644
--- a/code/modules/food_and_drinks/food/snacks_other.dm
+++ b/code/modules/food_and_drinks/food/snacks_other.dm
@@ -59,7 +59,7 @@
 	tastes = list("chocolate" = 1)
 	foodtype = JUNKFOOD | SUGAR
 	dunkable = TRUE
-	price = PRICE_LOW * 0.5
+	price = PRICE_LOW
 
 
 /obj/item/reagent_containers/food/snacks/hugemushroomslice
diff --git a/code/modules/food_and_drinks/food/snacks_vend.dm b/code/modules/food_and_drinks/food/snacks_vend.dm
index 797a4f4a7..a894e3bd0 100644
--- a/code/modules/food_and_drinks/food/snacks_vend.dm
+++ b/code/modules/food_and_drinks/food/snacks_vend.dm
@@ -12,7 +12,7 @@
 	filling_color = "#D2691E"
 	tastes = list("candy" = 1)
 	foodtype = JUNKFOOD | SUGAR
-	price = PRICE_LOW * 0.5
+	price = PRICE_LOW
 
 /obj/item/reagent_containers/food/snacks/sosjerky
 	name = "\improper Scaredy's Private Reserve Beef Jerky"
@@ -24,7 +24,7 @@
 	filling_color = "#8B0000"
 	tastes = list("dried meat" = 1)
 	foodtype = JUNKFOOD | MEAT | SUGAR
-	price = PRICE_LOW * 0.75
+	price = PRICE_LOW
 
 /obj/item/reagent_containers/food/snacks/sosjerky/healthy
 	name = "homemade beef jerky"
@@ -43,7 +43,7 @@
 	filling_color = "#FFD700"
 	tastes = list("salt" = 1, "crisps" = 1)
 	foodtype = JUNKFOOD | FRIED
-	price = PRICE_LOW * 0.5
+	price = PRICE_LOW
 
 /obj/item/reagent_containers/food/snacks/no_raisin
 	name = "4no raisins"
@@ -55,7 +55,7 @@
 	filling_color = "#8B0000"
 	tastes = list("dried raisins" = 1)
 	foodtype = JUNKFOOD | FRUIT | SUGAR
-	price = PRICE_LOW * 0.5
+	price = PRICE_LOW
 
 /obj/item/reagent_containers/food/snacks/no_raisin/healthy
 	name = "homemade raisins"
@@ -84,7 +84,7 @@
 	filling_color = "#FFD700"
 	tastes = list("cheese" = 5, "crisps" = 2)
 	foodtype = JUNKFOOD | DAIRY | SUGAR
-	price = PRICE_LOW * 0.5
+	price = PRICE_LOW
 
 /obj/item/reagent_containers/food/snacks/soyfood
 	name = "Soyfood"
@@ -96,7 +96,7 @@
 	filling_color = "#FFD700"
 	tastes = list("nanomachines" = 2, "soybeans" = 5)
 	foodtype = JUNKFOOD | DAIRY | GRAIN
-	price = PRICE_LOW * 1.25
+	price = PRICE_LOW
 
 /obj/item/reagent_containers/food/snacks/syndicake
 	name = "syndi-cakes"
@@ -107,7 +107,7 @@
 	filling_color = "#F5F5DC"
 	tastes = list("sweetness" = 3, "cake" = 1)
 	foodtype = GRAIN | FRUIT | VEGETABLES | ANTITOXIC
-	price = PRICE_LOW * 1.75
+	price = PRICE_LOW
 
 /obj/item/reagent_containers/food/snacks/carbonnanotube_noodles
 	name = "carbon nanotube noodles"
@@ -119,7 +119,7 @@
 	filling_color = "#FFD700"
 	tastes = list("charcoal" = 1, "spiciness" = 3, "soysauce" = 3)
 	foodtype = GRAIN | VEGETABLES
-	price = PRICE_LOW * 1.75
+	price = PRICE_LOW
 
 /obj/item/reagent_containers/food/snacks/bird_seed
 	name = "Sunflower Seeds"
diff --git a/code/modules/vending/_vending.dm b/code/modules/vending/_vending.dm
index d57c37f32..0e06b1638 100644
--- a/code/modules/vending/_vending.dm
+++ b/code/modules/vending/_vending.dm
@@ -170,7 +170,7 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
 		R.price = baseprice
 		if(product) //its a item!
 			if((initial(product.price)))
-				R.price = initial(product.price)
+				R.price = FLOOR(initial(product.price), 1)
 			else
 				R.price = baseprice
 		if(free)
diff --git a/hyperstation/code/game/objects/items/lovedice.dm b/hyperstation/code/game/objects/items/lovedice.dm
index a3d36b163..1bba2e1a1 100644
--- a/hyperstation/code/game/objects/items/lovedice.dm
+++ b/hyperstation/code/game/objects/items/lovedice.dm
@@ -12,7 +12,7 @@ sarcoph mar 2022
 	desc = "Contains all the intimate ideas you'll ever need. A game that everyone wins!"
 	icon = 'hyperstation/icons/obj/toy.dmi'
 	icon_state = "lovedicebag"
-	price = PRICE_LOW
+	price = PRICE_LOW * 1.25
 
 /obj/item/storage/pill_bottle/lovedice/Initialize()
 	. = ..()
diff --git a/hyperstation/code/obj/condom.dm b/hyperstation/code/obj/condom.dm
index 1e3aeb8f3..bdb8ff3b6 100644
--- a/hyperstation/code/obj/condom.dm
+++ b/hyperstation/code/obj/condom.dm
@@ -9,7 +9,7 @@
 	icon_state 			= "b_condom_wrapped"
 	var/unwrapped			= 0
 	w_class = WEIGHT_CLASS_TINY
-	price = PRICE_LOW
+	price = PRICE_LOW * 1.25
 
 obj/item/condom/Initialize()
 	create_reagents(300, DRAWABLE|NO_REACT)
diff --git a/hyperstation/code/obj/rope.dm b/hyperstation/code/obj/rope.dm
index 28bb84750..a66cde289 100644
--- a/hyperstation/code/obj/rope.dm
+++ b/hyperstation/code/obj/rope.dm
@@ -10,7 +10,7 @@
 	item_state = "rope" //This sprite is in restraints.dmi until I figure out how to refrence somewhere else
 	cuffsound = 'sound/weapons/cablecuff.ogg'
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
-	price = PRICE_LOW * 1.25	//What's so expensive about a rope?
+	price = PRICE_LOW * 1.25
 
 /mob/living/proc/rope_add(source) //Check to see if the rope is on, and then add effects
 	var/mob/living/carbon/M = source
diff --git a/hyperstation/code/obj/sounding.dm b/hyperstation/code/obj/sounding.dm
index 94b8b33bf..685d658d5 100644
--- a/hyperstation/code/obj/sounding.dm
+++ b/hyperstation/code/obj/sounding.dm
@@ -6,7 +6,7 @@
 	icon_state 			= "sounding_wrapped"
 	var/unwrapped			= 0
 	w_class = WEIGHT_CLASS_TINY
-	price = PRICE_LOW
+	price = PRICE_LOW * 1.25
 
 /obj/item/sounding/attack_self(mob/user)
 	if(!istype(user))
diff --git a/hyperstation/code/obj/vibrator.dm b/hyperstation/code/obj/vibrator.dm
index 870b5069b..df93113c4 100644
--- a/hyperstation/code/obj/vibrator.dm
+++ b/hyperstation/code/obj/vibrator.dm
@@ -13,7 +13,7 @@
 	var/style = "long"
 	var/inside = FALSE
 	var/last = 0
-	price = PRICE_LOW * 1.2
+	price = PRICE_LOW * 1.25
 
 /obj/item/electropack/vibrator/Initialize() //give the device its own code
 	. = ..()

From 390ed769e9125d28bb4c2fe6de4413d44f0f95d2 Mon Sep 17 00:00:00 2001
From: DragonTrance <dylan661993@gmail.com>
Date: Wed, 8 Jun 2022 19:22:56 -0400
Subject: [PATCH 11/19] more balancing

---
 code/__DEFINES/economy.dm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/code/__DEFINES/economy.dm b/code/__DEFINES/economy.dm
index eb2055e06..3d62609a1 100644
--- a/code/__DEFINES/economy.dm
+++ b/code/__DEFINES/economy.dm
@@ -5,8 +5,9 @@
 #define BASEPAY_CAPTAIN 1.65
 
 
-#define PRICE_BASE		(BASEPAY_ASSISTANT * 16)
-#define PRICE_LOW		(PRICE_BASE * 0.75)
-#define PRICE_HIGH		(PRICE_BASE * 2)
-#define PRICE_EROTICA	(PRICE_HIGH * 1.15)
+#define PRICE_BASE		(BASEPAY_ASSISTANT * 32)
+#define PRICE_DEFAULT	(PRICE_BASE * 0.5)
+#define PRICE_LOW		(PRICE_DEFAULT * 0.75)
+#define PRICE_HIGH		(PRICE_DEFAULT * 2)
+#define PRICE_EROTICA	(PRICE_DEFAULT * 1.75)
 #define PRICE_EXPENSIVE	(PRICE_HIGH * 1.5)

From 61e74f792149a1e8a0131aa0d7dc1b9c52a68a6b Mon Sep 17 00:00:00 2001
From: DragonTrance <dylan661993@gmail.com>
Date: Wed, 8 Jun 2022 19:28:27 -0400
Subject: [PATCH 12/19] more balancing

---
 hyperstation/code/obj/condom.dm   | 4 ++--
 hyperstation/code/obj/sounding.dm | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/hyperstation/code/obj/condom.dm b/hyperstation/code/obj/condom.dm
index bdb8ff3b6..159bc7bdd 100644
--- a/hyperstation/code/obj/condom.dm
+++ b/hyperstation/code/obj/condom.dm
@@ -7,9 +7,9 @@
 	icon 				= 'hyperstation/icons/obj/condom.dmi'
 	throwforce			= 0
 	icon_state 			= "b_condom_wrapped"
-	var/unwrapped			= 0
+	var/unwrapped		= 0
 	w_class = WEIGHT_CLASS_TINY
-	price = PRICE_LOW * 1.25
+	price = PRICE_LOW * 0.5
 
 obj/item/condom/Initialize()
 	create_reagents(300, DRAWABLE|NO_REACT)
diff --git a/hyperstation/code/obj/sounding.dm b/hyperstation/code/obj/sounding.dm
index 685d658d5..e6f07cdbf 100644
--- a/hyperstation/code/obj/sounding.dm
+++ b/hyperstation/code/obj/sounding.dm
@@ -4,9 +4,9 @@
 	icon 				= 'hyperstation/icons/obj/sounding.dmi'
 	throwforce			= 0
 	icon_state 			= "sounding_wrapped"
-	var/unwrapped			= 0
+	var/unwrapped		= 0
 	w_class = WEIGHT_CLASS_TINY
-	price = PRICE_LOW * 1.25
+	price = PRICE_LOW
 
 /obj/item/sounding/attack_self(mob/user)
 	if(!istype(user))

From 7ae8ec6b080d11363be55e630897d136099280d5 Mon Sep 17 00:00:00 2001
From: DragonTrance <dylan661993@gmail.com>
Date: Wed, 8 Jun 2022 19:33:55 -0400
Subject: [PATCH 13/19] moreeee balancesssss

---
 code/__DEFINES/economy.dm                    | 2 +-
 code/game/objects/items/tools/weldingtool.dm | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/__DEFINES/economy.dm b/code/__DEFINES/economy.dm
index 3d62609a1..1c74acddd 100644
--- a/code/__DEFINES/economy.dm
+++ b/code/__DEFINES/economy.dm
@@ -10,4 +10,4 @@
 #define PRICE_LOW		(PRICE_DEFAULT * 0.75)
 #define PRICE_HIGH		(PRICE_DEFAULT * 2)
 #define PRICE_EROTICA	(PRICE_DEFAULT * 1.75)
-#define PRICE_EXPENSIVE	(PRICE_HIGH * 1.5)
+#define PRICE_EXPENSIVE	(PRICE_HIGH * 2)
diff --git a/code/game/objects/items/tools/weldingtool.dm b/code/game/objects/items/tools/weldingtool.dm
index 50b5f4754..bc83dabb7 100644
--- a/code/game/objects/items/tools/weldingtool.dm
+++ b/code/game/objects/items/tools/weldingtool.dm
@@ -344,7 +344,7 @@
 	item_state = "upindwelder"
 	max_fuel = 80
 	materials = list(MAT_METAL=70, MAT_GLASS=120)
-	price = PRICE_EXPENSIVE * 1.1
+	price = PRICE_EXPENSIVE * 1.5
 
 /obj/item/weldingtool/experimental
 	name = "experimental welding tool"

From 2b6fb195a23fcad4e1c609bad9911835b2e26221 Mon Sep 17 00:00:00 2001
From: DragonTrance <dylan661993@gmail.com>
Date: Wed, 8 Jun 2022 19:43:02 -0400
Subject: [PATCH 14/19] 1 paycheck every 15 minutes, in 5-minute intervals

---
 hyperstation/code/controllers/subsystem/economy.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hyperstation/code/controllers/subsystem/economy.dm b/hyperstation/code/controllers/subsystem/economy.dm
index 157a7ac3f..4efb15009 100644
--- a/hyperstation/code/controllers/subsystem/economy.dm
+++ b/hyperstation/code/controllers/subsystem/economy.dm
@@ -20,4 +20,4 @@ SUBSYSTEM_DEF(economy)
  * job datums if the respective one is null. You can pass zero arguments here and you'd get the "default" amount of a paycheck.
  */
 /datum/controller/subsystem/economy/proc/GetPaycheck(datum/bank_account/account, datum/job/job, multiplier=1)
-	return FLOOR(account:base_pay * job:base_paycheck_multiplier * multiplier, 1)
+	return FLOOR((account:base_pay * job:base_paycheck_multiplier * multiplier) / 3, 1)

From c771649850ef72235609d8bfee05960445b99a2f Mon Sep 17 00:00:00 2001
From: DragonTrance <dylan661993@gmail.com>
Date: Wed, 8 Jun 2022 21:39:27 -0400
Subject: [PATCH 15/19] Adds configuration options to economy pay & prices

---
 code/__DEFINES/economy.dm                     | 21 ++++----
 .../configuration/entries/game_options.dm     | 48 +++++++++++++++++++
 code/modules/jobs/job_types/job.dm            |  5 +-
 config/game_options.txt                       | 42 ++++++++++++++++
 4 files changed, 103 insertions(+), 13 deletions(-)

diff --git a/code/__DEFINES/economy.dm b/code/__DEFINES/economy.dm
index 1c74acddd..e08a6b7a4 100644
--- a/code/__DEFINES/economy.dm
+++ b/code/__DEFINES/economy.dm
@@ -1,13 +1,10 @@
-#define BASEPAY_ASSISTANT 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.3
-#define BASEPAY_CAPTAIN 1.65
+#define ECONOMY_TYPE_ROOKIE		"Rookie"
+#define ECONOMY_TYPE_DANGEROUS	"Dangerous"
+#define ECONOMY_TYPE_COMMAND	"Command"
 
-
-#define PRICE_BASE		(BASEPAY_ASSISTANT * 32)
-#define PRICE_DEFAULT	(PRICE_BASE * 0.5)
-#define PRICE_LOW		(PRICE_DEFAULT * 0.75)
-#define PRICE_HIGH		(PRICE_DEFAULT * 2)
-#define PRICE_EROTICA	(PRICE_DEFAULT * 1.75)
-#define PRICE_EXPENSIVE	(PRICE_HIGH * 2)
+#define ECONOY_PRICE_DEFAULT		0
+#define ECONOMY_PRICE_LOW			1
+#define ECONOMY_PRICE_HIGH			2
+#define ECONOMY_PRICE_EROTIC		3
+#define ECONOMY_PRICE_EXPENSIVE		4
+#define ECONOMY_PRICE_EXPENSIVE_AF	5
diff --git a/code/controllers/configuration/entries/game_options.dm b/code/controllers/configuration/entries/game_options.dm
index 1965d4d89..0dad98b29 100644
--- a/code/controllers/configuration/entries/game_options.dm
+++ b/code/controllers/configuration/entries/game_options.dm
@@ -384,3 +384,51 @@
 	min_val = 0
 
 /datum/config_entry/flag/dynamic_mode
+
+/datum/config_entry/number/economy_base_payment
+	config_entry_value = 80
+	min_val = 0
+
+/datum/config_entry/number/economy_base_pay_ratio
+	config_entry_value = 3
+	min_val = 1
+
+/datum/config_entry/number/economy_price_low
+	config_entry_value = 8
+	min_val = 0
+
+/datum/config_entry/number/economy_price_default
+	config_entry_value = 15
+	min_val = 0
+
+/datum/config_entry/number/economy_price_high
+	config_entry_value = 30
+	min_val = 0
+
+/datum/config_entry/number/economy_price_erotic
+	config_entry_value = 25
+	min_val = 0
+
+/datum/config_entry/number/economy_price_expensive
+	config_entry_value = 60
+	min_val = 0
+
+/datum/config_entry/number/economy_price_expensive_af
+	config_entry_value = 90
+	min_val = 0
+
+/datum/config_entry/number/economy_job_rate_default
+	config_entry_value = 1.2
+	min_val = 0
+
+/datum/config_entry/keyed_list/economy_job_rate
+	key_mode = KEY_MODE_TEXT
+	value_mode = VALUE_MODE_NUM
+	lowercase = FALSE
+	splitter = ","
+
+/datum/config_entry/keyed_list/economy_job_rate_area
+	key_mode = KEY_MODE_TEXT
+	value_mode = VALUE_MODE_NUM
+	lowercase = FALSE
+	splitter = ","
diff --git a/code/modules/jobs/job_types/job.dm b/code/modules/jobs/job_types/job.dm
index ed4347265..590adee04 100644
--- a/code/modules/jobs/job_types/job.dm
+++ b/code/modules/jobs/job_types/job.dm
@@ -62,13 +62,16 @@
 	var/list/alt_titles = list()
 
 	/// A multiplier for how much a person gets each paycheck
-	var/base_paycheck_multiplier = BASEPAY_DEFAULT
+	var/base_paycheck_multiplier = 1.2
 
 	var/override_roundstart_spawn = null		//Where the player spawns at roundstart if defined
 
 	//whitelisting
 	var/whitelist_type = ""
 
+/datum/job/New()
+	base_paycheck_multiplier = CONFIG_GET(number/economy_job_rate_default)
+
 //Only override this proc
 //H is usually a human unless an /equip override transformed it
 /datum/job/proc/after_spawn(mob/living/H, mob/M, latejoin = FALSE)
diff --git a/config/game_options.txt b/config/game_options.txt
index 495040381..0f73f1f08 100644
--- a/config/game_options.txt
+++ b/config/game_options.txt
@@ -583,3 +583,45 @@ BOX_RANDOM_ENGINE Box TEG,2
 BOX_RANDOM_ENGINE Box Empty,0
 BOX_RANDOM_ENGINE Box Antimatter,0
 BOX_RANDOM_ENGINE Box P.A.C.M.A.N,0
+
+#
+## HYPERSTATION
+#
+
+## ECONOMY
+# Paychecks get sent to each bank account, which is only initialized if the account holder spawned on the station.
+# Bank Accounts are tied to the ID cards that players spawn with. If you have an unset pin, then that means anyone that gets the ID card has access to your money
+
+# The base amount of credits, before any math whatsoever gets involved, that paychecks give
+ECONOMY_BASE_PAYMENT 40
+
+# The base pay for paychecks get divided by this amount. Useful for slowing down the rate of payment.
+ECONOMY_BASE_PAY_RATIO 3
+
+# The default multiplier for a paycheck if nothing is assigned to a specific job.
+# You're allowed to set specific jobs a specific type of pay multiplier with ECONOMY_JOB_RATE
+ECONOMY_JOB_RATE_DEFAULT 1.2
+# The multiplier that Rookies get. This should be slightly more than assistant but less than default.
+ECONOMY_JOB_RATE_AREA Rookie, 1.1
+# The multiplier that Dangerous jobs get, such as Shaft Miner and Security. Should be somewhere between default and command pay rate
+ECONOMY_JOB_RATE_AREA Dangerous, 1.3
+# The multiplier that Command roles get, including QM because they're a head :)
+ECONOMY_JOB_RATE_AREA Command, 1.4
+# The multiplier for payment that the Captain gets. He controls the station, logically it's harder to do than all of the other jobs.
+ECONOMY_JOB_RATE captain, 1.65
+
+# Example for adding a single job datum. This basically adds /job/datum/ to what you put here. The value will be included if it falls in a category from ECONOMY_JOB_RATE
+# This is a multiplier that Assistants get for their paycheck.
+ECONOMY_JOB_RATE assistant, 1
+
+
+# Default price for items that use these values
+ECONOMY_PRICE_LOW 8
+ECONOMY_PRICE_DEFAULT 15
+ECONOMY_PRICE_HIGH 30
+ECONOMY_PRICE_EROTIC 25
+ECONOMY_PRICE_EXPENSIVE 60
+ECONOMY_PRICE_EXPENSIVE_AF 90
+
+# A multiplier to the prices of items inside vendors. Avoid setting this lower than the Assistant's paycheck multiplier if possible
+ECONOMY_PRICE_MULTIPLIER 1

From 7bae2a36eeb2c796ec74cd4afe2cbd2f8a9c2798 Mon Sep 17 00:00:00 2001
From: DragonTrance <dylan661993@gmail.com>
Date: Thu, 9 Jun 2022 17:54:40 -0400
Subject: [PATCH 16/19] config junk

---
 code/__DEFINES/economy.dm                     | 13 +++++-----
 .../configuration/entries/game_options.dm     |  4 +++
 code/controllers/subsystem/job.dm             |  5 ++++
 code/game/objects/items.dm                    |  5 ++--
 code/game/objects/items/cigs_lighters.dm      |  1 -
 code/game/objects/items/mesmetron.dm          |  2 +-
 code/game/objects/items/storage/belt.dm       |  2 +-
 code/game/objects/items/storage/boxes.dm      |  6 +++--
 code/game/objects/items/storage/fancy.dm      |  9 ++++---
 code/game/objects/items/tools/weldingtool.dm  |  3 ++-
 code/modules/clothing/gloves/color.dm         |  9 ++++---
 code/modules/clothing/head/jobs.dm            |  3 ++-
 code/modules/clothing/masks/hailer.dm         |  3 ++-
 code/modules/clothing/neck/_neck.dm           |  3 ++-
 code/modules/clothing/shoes/miscellaneous.dm  |  3 ++-
 code/modules/clothing/suits/jobs.dm           |  2 +-
 code/modules/clothing/suits/miscellaneous.dm  |  3 ++-
 code/modules/clothing/under/jobs/civilian.dm  |  2 +-
 code/modules/clothing/under/jobs/security.dm  |  8 +++---
 code/modules/food_and_drinks/drinks/drinks.dm | 15 ++++++-----
 .../food_and_drinks/drinks/drinks/bottle.dm   |  3 ++-
 .../drinks/drinks/drinkingglass.dm            |  5 ++--
 .../modules/food_and_drinks/food/condiment.dm |  3 ++-
 code/modules/food_and_drinks/food/snacks.dm   |  2 ++
 .../food_and_drinks/food/snacks_other.dm      |  3 ++-
 .../food_and_drinks/food/snacks_vend.dm       | 14 +++-------
 code/modules/jobs/job_types/assistant.dm      |  2 --
 code/modules/jobs/job_types/captain.dm        |  4 +--
 code/modules/jobs/job_types/cargo_service.dm  | 18 +++++++------
 code/modules/jobs/job_types/civilian.dm       |  8 +++---
 .../jobs/job_types/civilian_chaplain.dm       |  2 +-
 code/modules/jobs/job_types/engineering.dm    |  4 +--
 code/modules/jobs/job_types/job.dm            |  6 +++++
 code/modules/jobs/job_types/medical.dm        |  6 ++---
 code/modules/jobs/job_types/science.dm        |  4 +--
 code/modules/jobs/job_types/security.dm       |  7 +++--
 .../reagents/reagent_containers/glass.dm      |  2 +-
 .../reagents/reagent_containers/pill.dm       | 11 +++++---
 code/modules/vending/_vending.dm              | 14 +++++-----
 config/game_options.txt                       | 13 ++++++----
 .../code/controllers/subsystem/economy.dm     | 26 +++++++++++++++++++
 .../code/game/objects/items/cosmetics.dm      |  3 ++-
 .../code/game/objects/items/lovedice.dm       |  3 ++-
 hyperstation/code/modules/economy/account.dm  |  5 ++--
 hyperstation/code/obj/condom.dm               |  2 +-
 hyperstation/code/obj/fleshlight.dm           | 13 ++++++----
 hyperstation/code/obj/kinkyclothes.dm         | 12 ++++++---
 hyperstation/code/obj/rope.dm                 |  3 ++-
 hyperstation/code/obj/sounding.dm             |  2 +-
 hyperstation/code/obj/vibrator.dm             |  2 +-
 .../items/devices/radio/shockcollar.dm        |  3 ++-
 51 files changed, 192 insertions(+), 114 deletions(-)

diff --git a/code/__DEFINES/economy.dm b/code/__DEFINES/economy.dm
index e08a6b7a4..e87b19bc4 100644
--- a/code/__DEFINES/economy.dm
+++ b/code/__DEFINES/economy.dm
@@ -2,9 +2,10 @@
 #define ECONOMY_TYPE_DANGEROUS	"Dangerous"
 #define ECONOMY_TYPE_COMMAND	"Command"
 
-#define ECONOY_PRICE_DEFAULT		0
-#define ECONOMY_PRICE_LOW			1
-#define ECONOMY_PRICE_HIGH			2
-#define ECONOMY_PRICE_EROTIC		3
-#define ECONOMY_PRICE_EXPENSIVE		4
-#define ECONOMY_PRICE_EXPENSIVE_AF	5
+#define ECONOMY_PRICE_DEFAULT		1
+#define ECONOMY_PRICE_LOW			2
+#define ECONOMY_PRICE_HIGH			3
+#define ECONOMY_PRICE_EROTIC		4
+#define ECONOMY_PRICE_EXPENSIVE		5
+#define ECONOMY_PRICE_EXPENSIVE_AF	6
+#define ECONOMY_PRICE_FORCED_FREE	7	//i sure do love force_free'd-ing with items :)
diff --git a/code/controllers/configuration/entries/game_options.dm b/code/controllers/configuration/entries/game_options.dm
index 0dad98b29..eff5c7b3e 100644
--- a/code/controllers/configuration/entries/game_options.dm
+++ b/code/controllers/configuration/entries/game_options.dm
@@ -393,6 +393,10 @@
 	config_entry_value = 3
 	min_val = 1
 
+/datum/config_entry/number/economy_price_multiplier
+	config_entry_value = 1
+	min_val = 0
+
 /datum/config_entry/number/economy_price_low
 	config_entry_value = 8
 	min_val = 0
diff --git a/code/controllers/subsystem/job.dm b/code/controllers/subsystem/job.dm
index e53f550ac..32cd7cd80 100644
--- a/code/controllers/subsystem/job.dm
+++ b/code/controllers/subsystem/job.dm
@@ -14,6 +14,9 @@ SUBSYSTEM_DEF(job)
 
 	var/overflow_role = "Assistant"
 
+	var/list/economy_multipliers_by_job
+	var/list/economy_multipliers_by_type
+
 
 /datum/controller/subsystem/job/Initialize(timeofday)
 	SSmapping.HACK_LoadMapConfig()
@@ -23,6 +26,8 @@ SUBSYSTEM_DEF(job)
 		LoadJobs()
 	generate_selectable_species()
 	set_overflow_role(CONFIG_GET(string/overflow_job))
+	economy_multipliers_by_job = CONFIG_GET(keyed_list/economy_job_rate)
+	economy_multipliers_by_type = CONFIG_GET(keyed_list/economy_job_rate_area)
 	return ..()
 
 /datum/controller/subsystem/job/proc/set_overflow_role(new_overflow_role)
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index 0daccde53..c4e7dfee9 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -118,8 +118,9 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
 	var/list/grind_results //A reagent list containing the reagents this item produces when ground up in a grinder - this can be an empty list to allow for reagent transferring only
 	var/list/juice_results //A reagent list containing blah blah... but when JUICED in a grinder!
 
-	//Hyper economy
-	var/price = 0
+	//Hyper Economy
+	var/economy_type = 0
+	var/economy_price_mul = 1
 
 	//Hyper, for clothes that reveal your behind! butt stuff, you know how it is.
 	var/do_not_cover_butt = FALSE
diff --git a/code/game/objects/items/cigs_lighters.dm b/code/game/objects/items/cigs_lighters.dm
index 9e239420c..b1c5a900a 100644
--- a/code/game/objects/items/cigs_lighters.dm
+++ b/code/game/objects/items/cigs_lighters.dm
@@ -505,7 +505,6 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	w_class = WEIGHT_CLASS_TINY
 	flags_1 = CONDUCT_1
 	slot_flags = ITEM_SLOT_BELT
-	price = PRICE_LOW * 0.5
 	var/lit = 0
 	var/fancy = TRUE
 	var/overlay_state
diff --git a/code/game/objects/items/mesmetron.dm b/code/game/objects/items/mesmetron.dm
index b42ddb356..d3cd77ac1 100644
--- a/code/game/objects/items/mesmetron.dm
+++ b/code/game/objects/items/mesmetron.dm
@@ -7,9 +7,9 @@
 	w_class = WEIGHT_CLASS_SMALL
 	throw_range = 7
 	throw_speed = 3
+	economy_type = ECONOMY_PRICE_EROTIC
 	var/mob/living/carbon/subject = null
 	var/closed = FALSE
-	price = PRICE_EROTICA
 
 
 //Hypnotize someone
diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm
index 4cdc7b160..eb7447f77 100644
--- a/code/game/objects/items/storage/belt.dm
+++ b/code/game/objects/items/storage/belt.dm
@@ -240,7 +240,7 @@
 	desc = "Holds a variety of gear for \"alternative\" peacekeeping."
 	icon_state = "slutbelt"
 	item_state = "slut"
-	price = PRICE_EROTICA
+	economy_type = ECONOMY_PRICE_EROTIC
 
 obj/item/storage/belt/slut/ComponentInitialize()
 	. = ..()
diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm
index 03dffc430..b2acc45d8 100644
--- a/code/game/objects/items/storage/boxes.dm
+++ b/code/game/objects/items/storage/boxes.dm
@@ -418,7 +418,8 @@
 	desc = "<B>Instructions:</B> <I>Heat in microwave. Product will cool if not eaten within seven minutes.</I>"
 	icon_state = "donkpocketbox"
 	illustration=null
-	price = PRICE_EXPENSIVE * 0.85
+	economy_type = ECONOMY_PRICE_EXPENSIVE_AF
+	economy_price_mul = 0.85
 	var/donktype = /obj/item/reagent_containers/food/snacks/donkpocket
 	var/warmtype = /obj/item/reagent_containers/food/snacks/donkpocket/warm
 
@@ -675,9 +676,10 @@
 	item_state = "zippo"
 	w_class = WEIGHT_CLASS_TINY
 	slot_flags = ITEM_SLOT_BELT
-	price = PRICE_LOW * 0.5
 	drop_sound = 'sound/items/handling/matchbox_drop.ogg'
 	pickup_sound =  'sound/items/handling/matchbox_pickup.ogg'
+	economy_type = ECONOMY_PRICE_LOW
+	economy_price_mul = 0.5
 
 /obj/item/storage/box/matches/ComponentInitialize()
 	. = ..()
diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm
index 8f581933f..fb4ccdeed 100644
--- a/code/game/objects/items/storage/fancy.dm
+++ b/code/game/objects/items/storage/fancy.dm
@@ -136,7 +136,7 @@
 	slot_flags = ITEM_SLOT_BELT
 	icon_type = "cigarette"
 	spawn_type = /obj/item/clothing/mask/cigarette/space_cigarette
-	price = PRICE_LOW * 0.5
+	economy_type = ECONOMY_PRICE_LOW
 
 /obj/item/storage/fancy/cigarettes/ComponentInitialize()
 	. = ..()
@@ -231,7 +231,7 @@
 	desc = "Smoked by the truly robust."
 	icon_state = "robustg"
 	spawn_type = /obj/item/clothing/mask/cigarette/robustgold
-	price = PRICE_LOW * 1.25
+	economy_price_mul = 1.5
 
 /obj/item/storage/fancy/cigarettes/cigpack_carp
 	name = "\improper Carp Classic packet"
@@ -283,7 +283,7 @@
 	icon_state = "cig_paper_pack"
 	icon_type = "rolling paper"
 	spawn_type = /obj/item/rollingpaper
-	price = PRICE_LOW * 0.25
+	economy_price_mul = 0.25
 
 /obj/item/storage/fancy/rollingpapers/ComponentInitialize()
 	. = ..()
@@ -308,7 +308,8 @@
 	w_class = WEIGHT_CLASS_NORMAL
 	icon_type = "premium cigar"
 	spawn_type = /obj/item/clothing/mask/cigarette/cigar
-	price = PRICE_BASE
+	economy_type = ECONOMY_PRICE_EXPENSIVE
+	economy_price_mul = 0.75
 
 /obj/item/storage/fancy/cigarettes/cigars/ComponentInitialize()
 	. = ..()
diff --git a/code/game/objects/items/tools/weldingtool.dm b/code/game/objects/items/tools/weldingtool.dm
index bc83dabb7..9919959f9 100644
--- a/code/game/objects/items/tools/weldingtool.dm
+++ b/code/game/objects/items/tools/weldingtool.dm
@@ -344,7 +344,8 @@
 	item_state = "upindwelder"
 	max_fuel = 80
 	materials = list(MAT_METAL=70, MAT_GLASS=120)
-	price = PRICE_EXPENSIVE * 1.5
+	economy_type = ECONOMY_PRICE_EXPENSIVE_AF
+	economy_price_mul = 1.5
 
 /obj/item/weldingtool/experimental
 	name = "experimental welding tool"
diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm
index b79b77440..441e33847 100644
--- a/code/modules/clothing/gloves/color.dm
+++ b/code/modules/clothing/gloves/color.dm
@@ -8,7 +8,8 @@
 	item_color="yellow"
 	resistance_flags = NONE
 	var/can_be_cut = 1
-	price = PRICE_EXPENSIVE
+	economy_type = ECONOMY_PRICE_EXPENSIVE_AF
+	economy_price_mul = 0.85
 
 /obj/item/clothing/gloves/color/yellow/ce //funky looking, basically combat gloves
 	desc = "Special Insulated gloves with pricy thermal shielding normally only found in combat gloves."
@@ -34,7 +35,8 @@
 	item_color="yellow"
 	resistance_flags = NONE
 	var/can_be_cut = 1
-	price = PRICE_LOW * 0.5
+	economy_type = ECONOMY_PRICE_LOW
+	economy_price_mul = 1.2
 
 /obj/item/clothing/gloves/color/fyellow/New()
 	..()
@@ -129,7 +131,8 @@
 	siemens_coefficient = 0
 	permeability_coefficient = 0.05
 	resistance_flags = NONE
-	price = PRICE_EXPENSIVE
+	economy_type = ECONOMY_PRICE_EXPENSIVE_AF
+	economy_price_mul = 0.85
 
 /obj/item/clothing/gloves/color/rainbow
 	name = "rainbow gloves"
diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm
index 622a63bb6..dab47cd05 100644
--- a/code/modules/clothing/head/jobs.dm
+++ b/code/modules/clothing/head/jobs.dm
@@ -260,7 +260,8 @@
 	name = "security's bitch beret"
 	desc = "A softer beret with the word 'BITCH' embroidered on it in pink thread."
 	icon_state = "bitchberet"
-	price = PRICE_BASE * 1.5
+	economy_type = ECONOMY_PRICE_EROTIC
+	economy_price_mul = 0.85
 
 //Curator
 /obj/item/clothing/head/fedora/curator
diff --git a/code/modules/clothing/masks/hailer.dm b/code/modules/clothing/masks/hailer.dm
index 79864797a..4860e809e 100644
--- a/code/modules/clothing/masks/hailer.dm
+++ b/code/modules/clothing/masks/hailer.dm
@@ -45,7 +45,8 @@
 	item_state = "sluthailer"
 	aggressiveness = 0 //can't have your pets being mean!
 	actions_types = list(/datum/action/item_action/halt)
-	price = PRICE_EROTICA
+	economy_type = ECONOMY_PRICE_EXPENSIVE
+	economy_price_mul = 0.85
 
 /obj/item/clothing/mask/gas/sechailer/slut/attack_hand(mob/user)
 	if(iscarbon(user))
diff --git a/code/modules/clothing/neck/_neck.dm b/code/modules/clothing/neck/_neck.dm
index 98a9ea537..3c1ff4615 100644
--- a/code/modules/clothing/neck/_neck.dm
+++ b/code/modules/clothing/neck/_neck.dm
@@ -302,4 +302,5 @@
 	icon = 'icons/obj/clothing/neck.dmi'
 	icon_state = "bling"
 	item_color = "bling"
-	price = PRICE_EXPENSIVE
\ No newline at end of file
+	economy_type = ECONOMY_PRICE_EXPENSIVE
+	economy_price_mul = 1.25
diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm
index 069dda542..2f8ce402d 100644
--- a/code/modules/clothing/shoes/miscellaneous.dm
+++ b/code/modules/clothing/shoes/miscellaneous.dm
@@ -137,7 +137,8 @@
 	desc = "A pair of knee-high jackboots, complete with heels. All style, all the time."
 	icon_state = "jackboots-tall"
 	item_state = "jackboots-tall"
-	price = PRICE_BASE * 0.75
+	economy_type = ECONOMY_PRICE_DEFAULT
+	economy_price_mul = 0.75
 
 /obj/item/clothing/shoes/jackboots/fast
 	slowdown = -1
diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm
index 8eca34714..a59c1db0f 100644
--- a/code/modules/clothing/suits/jobs.dm
+++ b/code/modules/clothing/suits/jobs.dm
@@ -169,7 +169,7 @@
 	cold_protection = CHEST|LEGS|ARMS
 	heat_protection = CHEST|LEGS|ARMS
 	mutantrace_variation = NO_MUTANTRACE_VARIATION //you don't need it
-	price = PRICE_HIGH
+	economy_type = ECONOMY_PRICE_EXPENSIVE
 
 //Surgeon
 /obj/item/clothing/suit/apron/surgical
diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm
index 60314ead6..ee4d755b6 100644
--- a/code/modules/clothing/suits/miscellaneous.dm
+++ b/code/modules/clothing/suits/miscellaneous.dm
@@ -710,7 +710,8 @@
 	icon_state = "coatsecuritypink"
 	item_state = "coatsecuritypink"
 	hoodtype = /obj/item/clothing/head/hooded/winterhood/security/pink
-	price = PRICE_LOW
+	economy_type = ECONOMY_PRICE_EXPENSIVE
+	economy_price_mul = 0.85
 
 /obj/item/clothing/suit/hooded/wintercoat/security/Initialize()
 	. = ..()
diff --git a/code/modules/clothing/under/jobs/civilian.dm b/code/modules/clothing/under/jobs/civilian.dm
index 62c12768a..94efb5686 100644
--- a/code/modules/clothing/under/jobs/civilian.dm
+++ b/code/modules/clothing/under/jobs/civilian.dm
@@ -381,7 +381,7 @@
 	item_state = "b_suit"
 	item_color = "galaxy_blue"
 	can_adjust = FALSE
-	price = PRICE_EXPENSIVE
+	economy_type = ECONOMY_PRICE_DEFAULT
 
 /obj/item/clothing/under/lawyer/galaxy_red
 	name = "\improper Pulsar Gonne"
diff --git a/code/modules/clothing/under/jobs/security.dm b/code/modules/clothing/under/jobs/security.dm
index 20a06dedd..be6a42bae 100644
--- a/code/modules/clothing/under/jobs/security.dm
+++ b/code/modules/clothing/under/jobs/security.dm
@@ -30,7 +30,8 @@
 	icon_state = "rsecuritypink"
 	item_state = "r_suit"
 	item_color = "rsecuritypink"
-	price = PRICE_LOW
+	economy_type = ECONOMY_PRICE_DEFAULT
+	economy_price_mul = 1.35
 /obj/item/clothing/under/rank/security/skirt
 	name = "security jumpskirt"
 	desc = "A \"tactical\" security jumpsuit with the legs replaced by a skirt."
@@ -47,7 +48,8 @@
 	item_state = "secslutskirt"
 	item_color = null //i dont understand what item_color even is, apparently setting it to null means it won't change color in a washing machine?
 	mutantrace_variation = NO_MUTANTRACE_VARIATION //look at the first two comments in vg_under.dm
-	price = PRICE_EROTICA
+	economy_type = ECONOMY_PRICE_EROTIC
+	economy_price_mul = 0.75
 /obj/item/clothing/under/rank/security/skirt/slut/pink
 	desc = "A \"\"\"tactical\"\"\" security jumpsuit with the legs replaced by a skirt. No matter how you adjust it, it always feels a little too small. This one seems to have an experimental color scheme."
 	icon_state = "secslutskirtpink"
@@ -61,7 +63,7 @@
 	can_adjust = FALSE
 	body_parts_covered = CHEST|GROIN
 	mutantrace_variation = NO_MUTANTRACE_VARIATION
-	price = PRICE_EROTICA
+	economy_type = ECONOMY_PRICE_EROTIC
 
 
 /obj/item/clothing/under/rank/warden
diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm
index 85c41cb8a..2e4818df7 100644
--- a/code/modules/food_and_drinks/drinks/drinks.dm
+++ b/code/modules/food_and_drinks/drinks/drinks.dm
@@ -217,7 +217,7 @@
 	resistance_flags = FREEZE_PROOF
 	isGlass = FALSE
 	foodtype = BREAKFAST
-	price = PRICE_LOW
+	economy_type = ECONOMY_PRICE_LOW
 
 //Used by MREs
 /obj/item/reagent_containers/food/drinks/coffee/type2
@@ -241,7 +241,7 @@
 	icon_state = "tea"
 	item_state = "coffee"
 	spillable = TRUE
-	price = PRICE_LOW
+	economy_type = ECONOMY_PRICE_LOW
 
 /* Doesn't exist lol
 /datum/chemical_reaction/catnip_tea
@@ -265,7 +265,7 @@
 	icon_state = "tea"
 	desc = "An insult to Duke Purple is an insult to the Space Queen! Any proper gentleman will fight you, if you sully this tea."
 	list_reagents = list(/datum/reagent/consumable/tea = 30)
-	price = PRICE_LOW
+	economy_type = ECONOMY_PRICE_LOW
 
 /obj/item/reagent_containers/food/drinks/mug/coco
 	name = "Dutch hot coco"
@@ -284,7 +284,8 @@
 	list_reagents = list(/datum/reagent/consumable/dry_ramen = 30)
 	foodtype = GRAIN
 	isGlass = FALSE
-	price = PRICE_BASE * 0.75
+	economy_type = ECONOMY_PRICE_DEFAULT
+	economy_price_mul = 1.5
 
 /obj/item/reagent_containers/food/drinks/beer
 	name = "space beer"
@@ -423,7 +424,8 @@
 	reagent_flags = NONE
 	spillable = FALSE
 	isGlass = FALSE
-	price = PRICE_LOW
+	economy_type = ECONOMY_PRICE_LOW
+	economy_price_mul = 0.8
 
 /obj/item/reagent_containers/food/drinks/soda_cans/suicide_act(mob/living/carbon/user)
 	user.visible_message("<span class='suicide'>[user] is trying to eat \the [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
@@ -548,4 +550,5 @@
 	icon_state = "menergy"
 	list_reagents = list(/datum/reagent/consumable/monkey_energy = 50)
 	foodtype = SUGAR
-	price = PRICE_HIGH * 1.25
+	economy_type = ECONOMY_PRICE_EXPENSIVE //same as insulated gloves but slightly cheaper given the nature of these
+	economy_price_mul = 0.75
diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm
index 70e139d3b..1a2ebce8c 100644
--- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm
+++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm
@@ -416,7 +416,8 @@
 	isGlass = FALSE
 	list_reagents = list(/datum/reagent/consumable/cream = 100)
 	foodtype = DAIRY
-	price = PRICE_LOW
+	economy_type = ECONOMY_PRICE_LOW
+	economy_price_mul = 1.5
 
 /obj/item/reagent_containers/food/drinks/bottle/tomatojuice
 	name = "tomato juice"
diff --git a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm b/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm
index 7ad3baf0c..86193090b 100644
--- a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm
+++ b/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm
@@ -93,10 +93,11 @@
 /obj/item/reagent_containers/food/drinks/drinkingglass/filled/nuka_cola
 	name = "Nuka Cola"
 	list_reagents = list(/datum/reagent/consumable/nuka_cola = 50)
-	price = PRICE_BASE * 1.1
+	economy_type = ECONOMY_PRICE_DEFAULT
+	economy_price_mul = 1.5
 
 /obj/item/reagent_containers/food/drinks/drinkingglass/filled/syndicatebomb
-	name = "Syndicat Bomb"
+	name = "Syndicate Bomb"
 	list_reagents = list(/datum/reagent/consumable/ethanol/syndicatebomb = 50)
 
 /obj/item/reagent_containers/food/drinks/drinkingglass/attackby(obj/item/I, mob/user, params)
diff --git a/code/modules/food_and_drinks/food/condiment.dm b/code/modules/food_and_drinks/food/condiment.dm
index 2693c192d..a33ac1eca 100644
--- a/code/modules/food_and_drinks/food/condiment.dm
+++ b/code/modules/food_and_drinks/food/condiment.dm
@@ -186,7 +186,8 @@
 	righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi'
 	list_reagents = list(/datum/reagent/consumable/milk = 50)
 	possible_states = list()
-	price = PRICE_LOW
+	economy_type = ECONOMY_PRICE_LOW
+	economy_price_mul = 1.5
 
 /obj/item/reagent_containers/food/condiment/flour
 	name = "flour sack"
diff --git a/code/modules/food_and_drinks/food/snacks.dm b/code/modules/food_and_drinks/food/snacks.dm
index ee7e129ae..426ed5013 100644
--- a/code/modules/food_and_drinks/food/snacks.dm
+++ b/code/modules/food_and_drinks/food/snacks.dm
@@ -35,6 +35,8 @@ All foods are distributed among various categories. Use common sense.
 	righthand_file = 'icons/mob/inhands/misc/food_righthand.dmi'
 	obj_flags = UNIQUE_RENAME
 	grind_results = list() //To let them be ground up to transfer their reagents
+	economy_type = ECONOMY_PRICE_LOW
+	economy_price_mul = 1.5
 	var/bitesize = 2
 	var/bitecount = 0
 	var/trash = null
diff --git a/code/modules/food_and_drinks/food/snacks_other.dm b/code/modules/food_and_drinks/food/snacks_other.dm
index b83e25905..dddee9331 100644
--- a/code/modules/food_and_drinks/food/snacks_other.dm
+++ b/code/modules/food_and_drinks/food/snacks_other.dm
@@ -59,7 +59,8 @@
 	tastes = list("chocolate" = 1)
 	foodtype = JUNKFOOD | SUGAR
 	dunkable = TRUE
-	price = PRICE_LOW
+	economy_type = ECONOMY_PRICE_LOW
+	economy_price_mul = 1.5
 
 
 /obj/item/reagent_containers/food/snacks/hugemushroomslice
diff --git a/code/modules/food_and_drinks/food/snacks_vend.dm b/code/modules/food_and_drinks/food/snacks_vend.dm
index a894e3bd0..a3aa7f9ea 100644
--- a/code/modules/food_and_drinks/food/snacks_vend.dm
+++ b/code/modules/food_and_drinks/food/snacks_vend.dm
@@ -12,7 +12,6 @@
 	filling_color = "#D2691E"
 	tastes = list("candy" = 1)
 	foodtype = JUNKFOOD | SUGAR
-	price = PRICE_LOW
 
 /obj/item/reagent_containers/food/snacks/sosjerky
 	name = "\improper Scaredy's Private Reserve Beef Jerky"
@@ -24,7 +23,6 @@
 	filling_color = "#8B0000"
 	tastes = list("dried meat" = 1)
 	foodtype = JUNKFOOD | MEAT | SUGAR
-	price = PRICE_LOW
 
 /obj/item/reagent_containers/food/snacks/sosjerky/healthy
 	name = "homemade beef jerky"
@@ -43,7 +41,6 @@
 	filling_color = "#FFD700"
 	tastes = list("salt" = 1, "crisps" = 1)
 	foodtype = JUNKFOOD | FRIED
-	price = PRICE_LOW
 
 /obj/item/reagent_containers/food/snacks/no_raisin
 	name = "4no raisins"
@@ -55,7 +52,6 @@
 	filling_color = "#8B0000"
 	tastes = list("dried raisins" = 1)
 	foodtype = JUNKFOOD | FRUIT | SUGAR
-	price = PRICE_LOW
 
 /obj/item/reagent_containers/food/snacks/no_raisin/healthy
 	name = "homemade raisins"
@@ -72,7 +68,6 @@
 	junkiness = 25
 	filling_color = "#FFD700"
 	foodtype = JUNKFOOD | GRAIN | SUGAR
-	price = PRICE_LOW
 
 /obj/item/reagent_containers/food/snacks/cheesiehonkers
 	name = "cheesie honkers"
@@ -84,7 +79,6 @@
 	filling_color = "#FFD700"
 	tastes = list("cheese" = 5, "crisps" = 2)
 	foodtype = JUNKFOOD | DAIRY | SUGAR
-	price = PRICE_LOW
 
 /obj/item/reagent_containers/food/snacks/soyfood
 	name = "Soyfood"
@@ -96,7 +90,7 @@
 	filling_color = "#FFD700"
 	tastes = list("nanomachines" = 2, "soybeans" = 5)
 	foodtype = JUNKFOOD | DAIRY | GRAIN
-	price = PRICE_LOW
+	economy_price_mul = 2
 
 /obj/item/reagent_containers/food/snacks/syndicake
 	name = "syndi-cakes"
@@ -107,7 +101,7 @@
 	filling_color = "#F5F5DC"
 	tastes = list("sweetness" = 3, "cake" = 1)
 	foodtype = GRAIN | FRUIT | VEGETABLES | ANTITOXIC
-	price = PRICE_LOW
+	economy_price_mul = 2.5
 
 /obj/item/reagent_containers/food/snacks/carbonnanotube_noodles
 	name = "carbon nanotube noodles"
@@ -119,7 +113,7 @@
 	filling_color = "#FFD700"
 	tastes = list("charcoal" = 1, "spiciness" = 3, "soysauce" = 3)
 	foodtype = GRAIN | VEGETABLES
-	price = PRICE_LOW
+	economy_price_mul = 2.5
 
 /obj/item/reagent_containers/food/snacks/bird_seed
 	name = "Sunflower Seeds"
@@ -130,4 +124,4 @@
 	filling_color = "#b497162f"
 	tastes = list("olives" = 1, "Nuts" = 3, "spice" = 2)
 	foodtype = GRAIN | VEGETABLES
-	price = PRICE_LOW
\ No newline at end of file
+	economy_price_mul = 2.5
\ No newline at end of file
diff --git a/code/modules/jobs/job_types/assistant.dm b/code/modules/jobs/job_types/assistant.dm
index 82e65a84a..cecc7d3e7 100644
--- a/code/modules/jobs/job_types/assistant.dm
+++ b/code/modules/jobs/job_types/assistant.dm
@@ -14,8 +14,6 @@ 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()
 	if(CONFIG_GET(flag/assistants_have_maint_access) || !CONFIG_GET(flag/jobs_have_minimal_access)) //Config has assistant maint access set
diff --git a/code/modules/jobs/job_types/captain.dm b/code/modules/jobs/job_types/captain.dm
index 19fde21df..13ff8523c 100644
--- a/code/modules/jobs/job_types/captain.dm
+++ b/code/modules/jobs/job_types/captain.dm
@@ -16,7 +16,7 @@ Captain
 	exp_requirements = 3000
 	exp_type = EXP_TYPE_COMMAND
 	exp_type_department = EXP_TYPE_COMMAND
-	base_paycheck_multiplier = BASEPAY_CAPTAIN
+	economy_type = ECONOMY_TYPE_COMMAND
 
 	outfit = /datum/outfit/job/captain
 
@@ -97,7 +97,7 @@ Head of Personnel
 	exp_requirements = 1500
 	exp_type = EXP_TYPE_SERVICE
 	exp_type_department = EXP_TYPE_SERVICE
-	base_paycheck_multiplier = BASEPAY_COMMAND
+	economy_type = ECONOMY_TYPE_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 5663d9ace..6d6bd8c9c 100644
--- a/code/modules/jobs/job_types/cargo_service.dm
+++ b/code/modules/jobs/job_types/cargo_service.dm
@@ -15,7 +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
+	economy_type = ECONOMY_TYPE_COMMAND
 	exp_requirements = 1200
 
 	outfit = /datum/outfit/job/quartermaster
@@ -89,7 +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
+	economy_type = ECONOMY_TYPE_DANGEROUS
 
 
 	outfit = /datum/outfit/job/miner
@@ -169,7 +169,7 @@ Bartender
 	spawn_positions = 1
 	supervisors = "the head of personnel"
 	selection_color = "#bbe291"
-	base_paycheck_multiplier = BASEPAY_ROOKIE
+	economy_type = ECONOMY_TYPE_ROOKIE
 
 	outfit = /datum/outfit/job/bartender
 
@@ -202,14 +202,15 @@ Cook
 	spawn_positions = 1
 	supervisors = "the head of personnel"
 	selection_color = "#bbe291"
-	base_paycheck_multiplier = BASEPAY_ROOKIE
-	var/cooks = 0 //Counts cooks amount
+	economy_type = ECONOMY_TYPE_ROOKIE
 
 	outfit = /datum/outfit/job/cook
 
 	access = list(ACCESS_HYDROPONICS, ACCESS_BAR, ACCESS_KITCHEN, ACCESS_MORGUE, ACCESS_MINERAL_STOREROOM)
 	minimal_access = list(ACCESS_KITCHEN, ACCESS_MORGUE, ACCESS_MINERAL_STOREROOM)
 
+	var/cooks = 0 //Counts cooks amount
+
 /datum/outfit/job/cook
 	name = "Cook"
 	jobtype = /datum/job/cook
@@ -256,7 +257,7 @@ Botanist
 	spawn_positions = 2
 	supervisors = "the head of personnel"
 	selection_color = "#bbe291"
-	base_paycheck_multiplier = BASEPAY_ROOKIE
+	economy_type = ECONOMY_TYPE_ROOKIE
 
 	outfit = /datum/outfit/job/botanist
 
@@ -295,14 +296,15 @@ Janitor
 	spawn_positions = 1
 	supervisors = "the head of personnel"
 	selection_color = "#bbe291"
-	base_paycheck_multiplier = BASEPAY_ROOKIE
-	var/global/janitors = 0
+	economy_type = ECONOMY_TYPE_ROOKIE
 
 	outfit = /datum/outfit/job/janitor
 
 	access = list(ACCESS_JANITOR, ACCESS_MAINT_TUNNELS, ACCESS_MINERAL_STOREROOM)
 	minimal_access = list(ACCESS_JANITOR, ACCESS_MAINT_TUNNELS, ACCESS_MINERAL_STOREROOM)
 
+	var/global/janitors = 0
+
 /datum/outfit/job/janitor
 	name = "Janitor"
 	jobtype = /datum/job/janitor
diff --git a/code/modules/jobs/job_types/civilian.dm b/code/modules/jobs/job_types/civilian.dm
index c0cc9965d..64c66734b 100644
--- a/code/modules/jobs/job_types/civilian.dm
+++ b/code/modules/jobs/job_types/civilian.dm
@@ -11,7 +11,7 @@ Clown
 	spawn_positions = 1
 	supervisors = "the head of personnel"
 	selection_color = "#dddddd"
-	base_paycheck_multiplier = BASEPAY_ROOKIE
+	economy_type = ECONOMY_TYPE_ROOKIE
 
 	outfit = /datum/outfit/job/clown
 
@@ -79,7 +79,7 @@ Mime
 	spawn_positions = 1
 	supervisors = "the head of personnel"
 	selection_color = "#dddddd"
-	base_paycheck_multiplier = BASEPAY_ROOKIE
+	economy_type = ECONOMY_TYPE_ROOKIE
 
 	outfit = /datum/outfit/job/mime
 
@@ -132,7 +132,7 @@ Curator
 	spawn_positions = 1
 	supervisors = "the head of personnel"
 	selection_color = "#dddddd"
-	base_paycheck_multiplier = BASEPAY_ROOKIE
+	economy_type = ECONOMY_TYPE_ROOKIE
 
 	outfit = /datum/outfit/job/curator
 
@@ -176,7 +176,7 @@ Lawyer
 	spawn_positions = 2
 	supervisors = "the head of personnel"
 	selection_color = "#dddddd"
-	base_paycheck_multiplier = BASEPAY_ROOKIE
+	economy_type = ECONOMY_TYPE_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 496824d7f..4b686924f 100644
--- a/code/modules/jobs/job_types/civilian_chaplain.dm
+++ b/code/modules/jobs/job_types/civilian_chaplain.dm
@@ -13,7 +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
+	economy_type = ECONOMY_TYPE_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 43a6f8d40..d7529e909 100644
--- a/code/modules/jobs/job_types/engineering.dm
+++ b/code/modules/jobs/job_types/engineering.dm
@@ -17,7 +17,7 @@ Chief Engineer
 	exp_requirements = 1500
 	exp_type = EXP_TYPE_ENGINEERING
 	exp_type_department = EXP_TYPE_ENGINEERING
-	base_paycheck_multiplier = BASEPAY_COMMAND
+	economy_type = ECONOMY_TYPE_COMMAND
 
 	outfit = /datum/outfit/job/ce
 
@@ -190,7 +190,7 @@ Junior Engineer
 	selection_color = "#fff5cc"
 	exp_requirements = 120
 	exp_type = EXP_TYPE_CREW
-	base_paycheck_multiplier = BASEPAY_ROOKIE
+	economy_type = ECONOMY_TYPE_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 590adee04..ea7af49ea 100644
--- a/code/modules/jobs/job_types/job.dm
+++ b/code/modules/jobs/job_types/job.dm
@@ -63,6 +63,8 @@
 
 	/// A multiplier for how much a person gets each paycheck
 	var/base_paycheck_multiplier = 1.2
+	/// The "type" of economy this job falls under
+	var/economy_type
 
 	var/override_roundstart_spawn = null		//Where the player spawns at roundstart if defined
 
@@ -71,6 +73,10 @@
 
 /datum/job/New()
 	base_paycheck_multiplier = CONFIG_GET(number/economy_job_rate_default)
+	if(SSjob.economy_multipliers_by_job[title])
+		base_paycheck_multiplier *= SSjob.economy_multipliers_by_job[title]
+	if(SSjob.economy_multipliers_by_type[economy_type])
+		base_paycheck_multiplier *= SSjob.economy_multipliers_by_type[economy_type]
 
 //Only override this proc
 //H is usually a human unless an /equip override transformed it
diff --git a/code/modules/jobs/job_types/medical.dm b/code/modules/jobs/job_types/medical.dm
index eb142a67c..a9c28619c 100644
--- a/code/modules/jobs/job_types/medical.dm
+++ b/code/modules/jobs/job_types/medical.dm
@@ -17,7 +17,7 @@ Chief Medical Officer
 	exp_requirements = 1500
 	exp_type = EXP_TYPE_MEDICAL
 	exp_type_department = EXP_TYPE_MEDICAL
-	base_paycheck_multiplier = BASEPAY_COMMAND
+	economy_type = ECONOMY_TYPE_COMMAND
 
 	outfit = /datum/outfit/job/cmo
 
@@ -238,7 +238,7 @@ Junior Doctor
 	selection_color = "#ffeef0"
 	exp_requirements = 120
 	exp_type = EXP_TYPE_CREW
-	base_paycheck_multiplier = BASEPAY_ROOKIE
+	economy_type = ECONOMY_TYPE_ROOKIE
 
 	outfit = /datum/outfit/job/doctor/junior
 
@@ -280,7 +280,7 @@ Psychologist
 	selection_color = "#ffeef0"
 	exp_requirements = 240
 	exp_type = EXP_TYPE_CREW
-	base_paycheck_multiplier = BASEPAY_ROOKIE
+	economy_type = ECONOMY_TYPE_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 95ff1ecb7..30934b5ae 100644
--- a/code/modules/jobs/job_types/science.dm
+++ b/code/modules/jobs/job_types/science.dm
@@ -17,7 +17,7 @@ Research Director
 	exp_requirements = 1500
 	exp_type = EXP_TYPE_SCIENCE
 	exp_type_department = EXP_TYPE_SCIENCE
-	base_paycheck_multiplier = BASEPAY_COMMAND
+	economy_type = ECONOMY_TYPE_COMMAND
 
 	outfit = /datum/outfit/job/rd
 
@@ -155,7 +155,7 @@ Junior Scientist
 	selection_color = "#ffeeff"
 	exp_requirements = 120
 	exp_type = EXP_TYPE_CREW
-	base_paycheck_multiplier = BASEPAY_ROOKIE
+	economy_type = ECONOMY_TYPE_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 a9421d5c0..6b83b0e55 100644
--- a/code/modules/jobs/job_types/security.dm
+++ b/code/modules/jobs/job_types/security.dm
@@ -23,7 +23,7 @@ Head of Security
 	exp_requirements = 2000
 	exp_type = EXP_TYPE_SECURITY
 	exp_type_department = EXP_TYPE_SECURITY
-	base_paycheck_multiplier = BASEPAY_COMMAND
+	economy_type = ECONOMY_TYPE_COMMAND
 
 	outfit = /datum/outfit/job/hos
 
@@ -92,6 +92,7 @@ Warden
 	exp_requirements = 720
 	exp_type = EXP_TYPE_SECURITY
 	exp_type_department = EXP_TYPE_SECURITY
+	economy_type = ECONOMY_TYPE_DANGEROUS
 
 	outfit = /datum/outfit/job/warden
 
@@ -151,6 +152,7 @@ Detective
 	exp_requirements = 300
 	exp_type = EXP_TYPE_SECURITY
 	exp_type_department = EXP_TYPE_SECURITY
+	economy_type = ECONOMY_TYPE_DANGEROUS
 
 	outfit = /datum/outfit/job/detective
 
@@ -208,6 +210,7 @@ Security Officer
 	exp_requirements = 420
 	exp_type = EXP_TYPE_SECURITY
 	exp_type_department = EXP_TYPE_SECURITY
+	economy_type = ECONOMY_TYPE_DANGEROUS
 
 	outfit = /datum/outfit/job/security
 
@@ -368,7 +371,7 @@ Junior Security Officer
 	minimal_player_age = 3
 	exp_requirements = 300
 	exp_type = EXP_TYPE_CREW
-	base_paycheck_multiplier = BASEPAY_ROOKIE
+	economy_type = ECONOMY_TYPE_ROOKIE
 
 	outfit = /datum/outfit/job/security/junior
 
diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm
index 8183a4688..463881e88 100644
--- a/code/modules/reagents/reagent_containers/glass.dm
+++ b/code/modules/reagents/reagent_containers/glass.dm
@@ -336,7 +336,7 @@
 	volume = 50
 	amount_per_transfer_from_this = 10
 	container_HP = 1
-	price = PRICE_LOW
+	economy_type = ECONOMY_PRICE_LOW
 
 /obj/item/reagent_containers/glass/beaker/waterbottle/Initialize()
 	beaker_weakness_bitflag |= TEMP_WEAK
diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm
index 712b4c12d..3394a515a 100644
--- a/code/modules/reagents/reagent_containers/pill.dm
+++ b/code/modules/reagents/reagent_containers/pill.dm
@@ -269,17 +269,20 @@
 /obj/item/reagent_containers/pill/penis_enlargement
 	name = "penis enlargement pill"
 	list_reagents = list(/datum/reagent/fermi/penis_enlarger = 10)
-	price = PRICE_LOW
 	icon_state = "pill_lewd"
+	economy_type = ECONOMY_PRICE_EROTIC
+	economy_price_mul = 0.25
 
 /obj/item/reagent_containers/pill/breast_enlargement
 	name = "breast enlargement pill"
 	list_reagents = list(/datum/reagent/fermi/breast_enlarger = 10)
-	price = PRICE_LOW
 	icon_state = "pill_lewd"
+	economy_type = ECONOMY_PRICE_EROTIC
+	economy_price_mul = 0.25
 
 /obj/item/reagent_containers/pill/butt_enlargement
 	name = "butt enlargement pill"
 	list_reagents = list(/datum/reagent/fermi/butt_enlarger = 10)
-	price = PRICE_LOW
-	icon_state = "pill_lewd"
\ No newline at end of file
+	icon_state = "pill_lewd"
+	economy_type = ECONOMY_PRICE_EROTIC
+	economy_price_mul = 0.25
diff --git a/code/modules/vending/_vending.dm b/code/modules/vending/_vending.dm
index 0e06b1638..fed6345ed 100644
--- a/code/modules/vending/_vending.dm
+++ b/code/modules/vending/_vending.dm
@@ -167,14 +167,12 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
 		var/datum/data/vending_product/R = new /datum/data/vending_product()
 		R.name = initial(temp.name)
 		R.product_path = typepath
-		R.price = baseprice
-		if(product) //its a item!
-			if((initial(product.price)))
-				R.price = FLOOR(initial(product.price), 1)
-			else
-				R.price = baseprice
-		if(free)
-			R.price = 0
+		if(!free)
+			R.price = baseprice
+			if(product) //its a item!
+				var/product_price = SSeconomy.GetPrice(product)
+				if(!isnull(product_price))
+					R.price = product_price
 		if(!start_empty)
 			R.amount = amount
 		R.max_amount = amount
diff --git a/config/game_options.txt b/config/game_options.txt
index 0f73f1f08..82168de3c 100644
--- a/config/game_options.txt
+++ b/config/game_options.txt
@@ -608,11 +608,13 @@ ECONOMY_JOB_RATE_AREA Dangerous, 1.3
 # The multiplier that Command roles get, including QM because they're a head :)
 ECONOMY_JOB_RATE_AREA Command, 1.4
 # The multiplier for payment that the Captain gets. He controls the station, logically it's harder to do than all of the other jobs.
-ECONOMY_JOB_RATE captain, 1.65
+ECONOMY_JOB_RATE Captain, 1.5
 
-# Example for adding a single job datum. This basically adds /job/datum/ to what you put here. The value will be included if it falls in a category from ECONOMY_JOB_RATE
-# This is a multiplier that Assistants get for their paycheck.
-ECONOMY_JOB_RATE assistant, 1
+# Examples for adding a single job datum. The value will be included if it falls in a category from ECONOMY_JOB_RATE
+# This is a multiplier that Assistants get for their paycheck. This is less than 1 because assistants get the default multiplier added to them
+ECONOMY_JOB_RATE Assistant, 0.83
+# This is a multiplier that Shaft Miners get for their paycheck. They count as a dangerous job, but they shouldn't get the same as security
+ECONOMY_JOB_RATE Shaft Miner, 0.9
 
 
 # Default price for items that use these values
@@ -623,5 +625,6 @@ ECONOMY_PRICE_EROTIC 25
 ECONOMY_PRICE_EXPENSIVE 60
 ECONOMY_PRICE_EXPENSIVE_AF 90
 
-# A multiplier to the prices of items inside vendors. Avoid setting this lower than the Assistant's paycheck multiplier if possible
+# A multiplier to the prices of items inside vendors. Avoid setting this higher than the Assistant's paycheck multiplier if possible
+# This scales every item found in vendors. If you want to change an individual item, you have to change it through code
 ECONOMY_PRICE_MULTIPLIER 1
diff --git a/hyperstation/code/controllers/subsystem/economy.dm b/hyperstation/code/controllers/subsystem/economy.dm
index 4efb15009..62906fb1c 100644
--- a/hyperstation/code/controllers/subsystem/economy.dm
+++ b/hyperstation/code/controllers/subsystem/economy.dm
@@ -7,6 +7,23 @@ SUBSYSTEM_DEF(economy)
 	/// How many "paychecks" someone gets at the creation of the bank account
 	var/roundstart_paychecks = 5
 	var/list/bank_accounts = list() //List of normal accounts (not department accounts)
+	var/static/list/prices_by_type
+
+/// Updates the prices from the config. Assorted into this individual proc instead of Initialize() so testers can change the config mid-round
+/// without having to initialize the economy SS again
+/datum/controller/subsystem/economy/proc/UpdatePrices()
+	prices_by_type = list()
+	prices_by_type += CONFIG_GET(number/economy_price_default)	//ECONOMY_PRICE_DEFAULT.. 1
+	prices_by_type += CONFIG_GET(number/economy_price_low)		//ECONOMY_PRICE_LOW.. 2
+	prices_by_type += CONFIG_GET(number/economy_price_high)
+	prices_by_type += CONFIG_GET(number/economy_price_erotic)
+	prices_by_type += CONFIG_GET(number/economy_price_expensive)
+	prices_by_type += CONFIG_GET(number/economy_price_expensive_af)
+	prices_by_type += 0 //ECONOMY_PRICE_FORCED_FREE.. 7
+
+/datum/controller/subsystem/economy/Initialize()
+	UpdatePrices()
+	return ..()
 
 /datum/controller/subsystem/economy/fire()
 	for(var/datum/bank_account/account as anything in bank_accounts)
@@ -21,3 +38,12 @@ SUBSYSTEM_DEF(economy)
  */
 /datum/controller/subsystem/economy/proc/GetPaycheck(datum/bank_account/account, datum/job/job, multiplier=1)
 	return FLOOR((account:base_pay * job:base_paycheck_multiplier * multiplier) / 3, 1)
+
+/**
+ * Returns a price value from a subtype of an /obj/item, assuming it was compiled to use money.
+ * Otherwise, returns null if it does not use economy
+ */
+/datum/controller/subsystem/economy/proc/GetPrice(obj/item/costly_item)
+	if(!costly_item.economy_type)
+		return
+	return FLOOR(prices_by_type[costly_item.economy_type] * costly_item.economy_price_mul, 1)
diff --git a/hyperstation/code/game/objects/items/cosmetics.dm b/hyperstation/code/game/objects/items/cosmetics.dm
index 4ddff571b..fa55603a7 100644
--- a/hyperstation/code/game/objects/items/cosmetics.dm
+++ b/hyperstation/code/game/objects/items/cosmetics.dm
@@ -7,8 +7,9 @@
 	icon_state = "nailcap"
 	item_state = "nailpolish"
 	w_class = WEIGHT_CLASS_SMALL
+	economy_type = ECONOMY_PRICE_LOW
+	economy_price_mul = 1.25
 	var/paint = "black"
-	price = PRICE_LOW * 0.5
 	var/mutable_appearance/bottle //show the colour on the bottle.
 
 /obj/item/nailpolish/red
diff --git a/hyperstation/code/game/objects/items/lovedice.dm b/hyperstation/code/game/objects/items/lovedice.dm
index 1bba2e1a1..2a1c72f8b 100644
--- a/hyperstation/code/game/objects/items/lovedice.dm
+++ b/hyperstation/code/game/objects/items/lovedice.dm
@@ -12,7 +12,8 @@ sarcoph mar 2022
 	desc = "Contains all the intimate ideas you'll ever need. A game that everyone wins!"
 	icon = 'hyperstation/icons/obj/toy.dmi'
 	icon_state = "lovedicebag"
-	price = PRICE_LOW * 1.25
+	economy_type = ECONOMY_PRICE_EROTIC
+	economy_price_mul = 0.5
 
 /obj/item/storage/pill_bottle/lovedice/Initialize()
 	. = ..()
diff --git a/hyperstation/code/modules/economy/account.dm b/hyperstation/code/modules/economy/account.dm
index 4edb3d39e..9e0fda100 100644
--- a/hyperstation/code/modules/economy/account.dm
+++ b/hyperstation/code/modules/economy/account.dm
@@ -8,8 +8,7 @@
 	/// The pin number that the owner wanted. Not set by default, so anyone can just steal your ID if you don't remember to set it
 	var/account_pin
 	/// The base amount of pay you get per paycheck
-	/// At the moment of documenting this, the base pay is 80
-	var/base_pay = PRICE_BASE * 5
+	var/base_pay = 80
 	/// The linked job datum for this bank account, for calculating unique base payment for each job
 	var/datum/job/account_job
 	/// The associated ID, for letting the card-holder know when a paycheck is processed
@@ -25,6 +24,8 @@
 		stack_trace("A new bank account was made without the economy subsystem being initialized first. If this is an issue, change the subsystem's init_order.")
 		return
 
+	base_pay = CONFIG_GET(number/economy_base_payment)
+
 	SSeconomy.bank_accounts += src
 	balance += SSeconomy.GetPaycheck(src, job, SSeconomy.roundstart_paychecks)
 
diff --git a/hyperstation/code/obj/condom.dm b/hyperstation/code/obj/condom.dm
index 159bc7bdd..642ab38d8 100644
--- a/hyperstation/code/obj/condom.dm
+++ b/hyperstation/code/obj/condom.dm
@@ -9,7 +9,7 @@
 	icon_state 			= "b_condom_wrapped"
 	var/unwrapped		= 0
 	w_class = WEIGHT_CLASS_TINY
-	price = PRICE_LOW * 0.5
+	economy_type = ECONOMY_PRICE_LOW
 
 obj/item/condom/Initialize()
 	create_reagents(300, DRAWABLE|NO_REACT)
diff --git a/hyperstation/code/obj/fleshlight.dm b/hyperstation/code/obj/fleshlight.dm
index bd1b1d8dd..7349a0522 100644
--- a/hyperstation/code/obj/fleshlight.dm
+++ b/hyperstation/code/obj/fleshlight.dm
@@ -10,10 +10,11 @@
 	icon_state = "fleshlight_base"
 	item_state = "fleshlight"
 	w_class = WEIGHT_CLASS_SMALL
-	var/sleevecolor = "#ffcbd4" //pink
-	price = PRICE_EROTICA * 0.75
-	var/mutable_appearance/sleeve
+	economy_type = ECONOMY_PRICE_EROTIC
+	economy_price_mul = 0.95
 	var/inuse = 0
+	var/sleevecolor = "#ffcbd4" //pink
+	var/mutable_appearance/sleeve
 
 /obj/item/fleshlight/examine(mob/user)
 	. = ..()
@@ -78,10 +79,11 @@
 	icon_state = "unpaired"
 	item_state = "fleshlight"
 	w_class = WEIGHT_CLASS_SMALL
+	economy_type = ECONOMY_PRICE_EROTIC
+	economy_price_mul = 1.2
 	var/partnercolor = "#ffcbd4"
 	var/partnerbase = "normal"
 	var/partnerorgan = "portal_vag"
-	price = PRICE_EROTICA
 	var/mutable_appearance/sleeve
 	var/mutable_appearance/organ
 	var/inuse = 0
@@ -276,7 +278,8 @@
 	icon = 'hyperstation/icons/obj/fleshlight.dmi'
 	desc = "A small silver box with Silver Love Co embossed."
 	icon_state = "box"
-	price = PRICE_EROTICA * 1.15
+	economy_type = ECONOMY_PRICE_EROTIC
+	economy_price_mul = 1.5
 
 // portal fleshlight box
 /obj/item/storage/box/portallight/PopulateContents()
diff --git a/hyperstation/code/obj/kinkyclothes.dm b/hyperstation/code/obj/kinkyclothes.dm
index 1326bad33..b44bc41df 100644
--- a/hyperstation/code/obj/kinkyclothes.dm
+++ b/hyperstation/code/obj/kinkyclothes.dm
@@ -6,14 +6,16 @@
 	icon = 'hyperstation/icons/obj/clothing/gloves.dmi'
 	alternate_worn_icon = 'hyperstation/icons/mobs/gloves.dmi'
 	mutantrace_variation = NO_MUTANTRACE_VARIATION
-	price = PRICE_EROTICA * 0.75
+	economy_type = ECONOMY_PRICE_EROTIC
+	economy_price_mul = 0.75
 
 /obj/item/clothing/gloves/latexsleeves/security
 	name = "security sleeves"
 	desc = "A pair of latex sleeves, with a band of red above the elbows denoting that the wearer is part of the security team."
 	icon_state = "latexsec"
 	item_state = "latexsec"
-	price = PRICE_EROTICA * 0.75
+	economy_type = ECONOMY_PRICE_EROTIC
+	economy_price_mul = 0.75
 
 /obj/item/clothing/head/dominatrixcap
 	name = "dominatrix cap"
@@ -45,7 +47,8 @@ obj/item/clothing/neck/stole
 	w_class = WEIGHT_CLASS_SMALL
 	icon_state = "stole"
 	item_state = ""	//no inhands
-	price = PRICE_HIGH * 0.75
+	economy_type = ECONOMY_PRICE_EXPENSIVE
+	economy_price_mul = 0.75
 
 obj/item/clothing/neck/stole/black
 	name = "black boa"
@@ -55,7 +58,8 @@ obj/item/clothing/neck/stole/black
 	icon_state = "stole"
 	item_state = ""	//no inhands
 	color = "#3d3d3d"
-	price = PRICE_HIGH * 0.75
+	economy_type = ECONOMY_PRICE_EXPENSIVE
+	economy_price_mul = 0.75
 
 /obj/item/clothing/suit/fluffyhalfcrop
 	name = "fluffy half-crop jacket"
diff --git a/hyperstation/code/obj/rope.dm b/hyperstation/code/obj/rope.dm
index a66cde289..d8cc0a6d6 100644
--- a/hyperstation/code/obj/rope.dm
+++ b/hyperstation/code/obj/rope.dm
@@ -10,7 +10,8 @@
 	item_state = "rope" //This sprite is in restraints.dmi until I figure out how to refrence somewhere else
 	cuffsound = 'sound/weapons/cablecuff.ogg'
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
-	price = PRICE_LOW * 1.25
+	economy_type = ECONOMY_PRICE_LOW
+	economy_price_mul = 1.25
 
 /mob/living/proc/rope_add(source) //Check to see if the rope is on, and then add effects
 	var/mob/living/carbon/M = source
diff --git a/hyperstation/code/obj/sounding.dm b/hyperstation/code/obj/sounding.dm
index e6f07cdbf..47e76a9fe 100644
--- a/hyperstation/code/obj/sounding.dm
+++ b/hyperstation/code/obj/sounding.dm
@@ -6,7 +6,7 @@
 	icon_state 			= "sounding_wrapped"
 	var/unwrapped		= 0
 	w_class = WEIGHT_CLASS_TINY
-	price = PRICE_LOW
+	economy_type = ECONOMY_PRICE_LOW
 
 /obj/item/sounding/attack_self(mob/user)
 	if(!istype(user))
diff --git a/hyperstation/code/obj/vibrator.dm b/hyperstation/code/obj/vibrator.dm
index df93113c4..247cc2440 100644
--- a/hyperstation/code/obj/vibrator.dm
+++ b/hyperstation/code/obj/vibrator.dm
@@ -13,7 +13,7 @@
 	var/style = "long"
 	var/inside = FALSE
 	var/last = 0
-	price = PRICE_LOW * 1.25
+	economy_type = ECONOMY_PRICE_EROTIC
 
 /obj/item/electropack/vibrator/Initialize() //give the device its own code
 	. = ..()
diff --git a/modular_citadel/code/game/objects/items/devices/radio/shockcollar.dm b/modular_citadel/code/game/objects/items/devices/radio/shockcollar.dm
index 440f8eba7..a2179fb21 100644
--- a/modular_citadel/code/game/objects/items/devices/radio/shockcollar.dm
+++ b/modular_citadel/code/game/objects/items/devices/radio/shockcollar.dm
@@ -11,7 +11,8 @@
 	strip_delay = 60
 	equip_delay_other = 60
 	materials = list(MAT_METAL=5000, MAT_GLASS=2000)
-	price = PRICE_HIGH
+	economy_type = ECONOMY_PRICE_EXPENSIVE
+	economy_price_mul = 0.75
 	var/tagname = null
 
 /datum/design/electropack/shockcollar

From ff3a9b443710b591330a32e860152d91fe93d8c7 Mon Sep 17 00:00:00 2001
From: DragonTrance <dylan661993@gmail.com>
Date: Thu, 9 Jun 2022 18:30:10 -0400
Subject: [PATCH 17/19] fixes + balancing

---
 .../configuration/entries/game_options.dm        |  2 +-
 code/controllers/subsystem/job.dm                | 10 ++++++----
 code/modules/vending/_vending.dm                 |  2 +-
 config/game_options.txt                          |  4 ++--
 .../code/controllers/subsystem/economy.dm        | 16 +++++++++++++---
 5 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/code/controllers/configuration/entries/game_options.dm b/code/controllers/configuration/entries/game_options.dm
index eff5c7b3e..dfa6f0041 100644
--- a/code/controllers/configuration/entries/game_options.dm
+++ b/code/controllers/configuration/entries/game_options.dm
@@ -386,7 +386,7 @@
 /datum/config_entry/flag/dynamic_mode
 
 /datum/config_entry/number/economy_base_payment
-	config_entry_value = 80
+	config_entry_value = 60
 	min_val = 0
 
 /datum/config_entry/number/economy_base_pay_ratio
diff --git a/code/controllers/subsystem/job.dm b/code/controllers/subsystem/job.dm
index 32cd7cd80..e1cc553bd 100644
--- a/code/controllers/subsystem/job.dm
+++ b/code/controllers/subsystem/job.dm
@@ -14,20 +14,22 @@ SUBSYSTEM_DEF(job)
 
 	var/overflow_role = "Assistant"
 
-	var/list/economy_multipliers_by_job
-	var/list/economy_multipliers_by_type
+	var/static/list/economy_multipliers_by_job
+	var/static/list/economy_multipliers_by_type
 
 
 /datum/controller/subsystem/job/Initialize(timeofday)
 	SSmapping.HACK_LoadMapConfig()
+	if(!economy_multipliers_by_job)
+		economy_multipliers_by_job = CONFIG_GET(keyed_list/economy_job_rate)
+	if(!economy_multipliers_by_type)
+		economy_multipliers_by_type = CONFIG_GET(keyed_list/economy_job_rate_area)
 	if(!occupations.len)
 		SetupOccupations()
 	if(CONFIG_GET(flag/load_jobs_from_txt))
 		LoadJobs()
 	generate_selectable_species()
 	set_overflow_role(CONFIG_GET(string/overflow_job))
-	economy_multipliers_by_job = CONFIG_GET(keyed_list/economy_job_rate)
-	economy_multipliers_by_type = CONFIG_GET(keyed_list/economy_job_rate_area)
 	return ..()
 
 /datum/controller/subsystem/job/proc/set_overflow_role(new_overflow_role)
diff --git a/code/modules/vending/_vending.dm b/code/modules/vending/_vending.dm
index fed6345ed..b2496308a 100644
--- a/code/modules/vending/_vending.dm
+++ b/code/modules/vending/_vending.dm
@@ -168,7 +168,7 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
 		R.name = initial(temp.name)
 		R.product_path = typepath
 		if(!free)
-			R.price = baseprice
+			R.price = FLOOR(baseprice * CONFIG_GET(number/economy_price_multiplier), 1)
 			if(product) //its a item!
 				var/product_price = SSeconomy.GetPrice(product)
 				if(!isnull(product_price))
diff --git a/config/game_options.txt b/config/game_options.txt
index 82168de3c..1d4977749 100644
--- a/config/game_options.txt
+++ b/config/game_options.txt
@@ -593,7 +593,7 @@ BOX_RANDOM_ENGINE Box P.A.C.M.A.N,0
 # Bank Accounts are tied to the ID cards that players spawn with. If you have an unset pin, then that means anyone that gets the ID card has access to your money
 
 # The base amount of credits, before any math whatsoever gets involved, that paychecks give
-ECONOMY_BASE_PAYMENT 40
+ECONOMY_BASE_PAYMENT 60
 
 # The base pay for paychecks get divided by this amount. Useful for slowing down the rate of payment.
 ECONOMY_BASE_PAY_RATIO 3
@@ -627,4 +627,4 @@ ECONOMY_PRICE_EXPENSIVE_AF 90
 
 # A multiplier to the prices of items inside vendors. Avoid setting this higher than the Assistant's paycheck multiplier if possible
 # This scales every item found in vendors. If you want to change an individual item, you have to change it through code
-ECONOMY_PRICE_MULTIPLIER 1
+ECONOMY_PRICE_MULTIPLIER 1.25
diff --git a/hyperstation/code/controllers/subsystem/economy.dm b/hyperstation/code/controllers/subsystem/economy.dm
index 62906fb1c..9627e9ef1 100644
--- a/hyperstation/code/controllers/subsystem/economy.dm
+++ b/hyperstation/code/controllers/subsystem/economy.dm
@@ -37,13 +37,23 @@ SUBSYSTEM_DEF(economy)
  * job datums if the respective one is null. You can pass zero arguments here and you'd get the "default" amount of a paycheck.
  */
 /datum/controller/subsystem/economy/proc/GetPaycheck(datum/bank_account/account, datum/job/job, multiplier=1)
-	return FLOOR((account:base_pay * job:base_paycheck_multiplier * multiplier) / 3, 1)
+	return FLOOR(account:base_pay * job:base_paycheck_multiplier * multiplier, 1)
 
 /**
  * Returns a price value from a subtype of an /obj/item, assuming it was compiled to use money.
  * Otherwise, returns null if it does not use economy
  */
 /datum/controller/subsystem/economy/proc/GetPrice(obj/item/costly_item)
-	if(!costly_item.economy_type)
+	var/economy_type
+	var/price_multiplier
+
+	if(istype(costly_item))
+		economy_type = costly_item.economy_type
+		price_multiplier = costly_item.economy_price_mul
+	else
+		economy_type = initial(costly_item.economy_type)
+		price_multiplier = initial(costly_item.economy_price_mul)
+
+	if(!economy_type)
 		return
-	return FLOOR(prices_by_type[costly_item.economy_type] * costly_item.economy_price_mul, 1)
+	return FLOOR(prices_by_type[economy_type] * price_multiplier, 1)

From b355e81b68432f3bac68f4d2aefb0b673a4e7677 Mon Sep 17 00:00:00 2001
From: DragonTrance <dylan661993@gmail.com>
Date: Thu, 9 Jun 2022 18:36:33 -0400
Subject: [PATCH 18/19] src tomfoolery

---
 hyperstation/code/obj/economy.dm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/hyperstation/code/obj/economy.dm b/hyperstation/code/obj/economy.dm
index 6ee1ece2e..04c1386a5 100644
--- a/hyperstation/code/obj/economy.dm
+++ b/hyperstation/code/obj/economy.dm
@@ -103,29 +103,29 @@
 		var/pininput = input(user, "Input pin", "Pin Number") as num|null
 		if(pininput)
 			if(pininput > 9999 || pininput < 1000)
-				to_chat(usr, "<span class='notice'>[name] buzzes, you must input a 4 digit number between 1000 and 9999.</span>")
+				to_chat(usr, "<span class='notice'>[src] buzzes, you must input a 4 digit number between 1000 and 9999.</span>")
 				return
 			pin = max(min( round(text2num(pininput)), 9999),1000) //4 numbers or less.
 			var/obj/item/card/id/idcard = held_card
 			if(pin == idcard.registered_account.account_pin)
-				to_chat(usr, "<span class='notice'>[name] beeps, accepting the pin.</span>")
+				to_chat(usr, "<span class='notice'>[src] beeps, accepting the pin.</span>")
 			else
-				to_chat(usr, "<span class='notice'>[name] buzzes, denying the pin.</span>")
+				to_chat(usr, "<span class='notice'>[src] buzzes, denying the pin.</span>")
 
 	if(href_list["changepin"])
 		playsound(src, get_sfx("terminal_type"), 25, 1)
 		var/pinchange = input(user, "Input pin", "Pin Number") as num|null
 		if(pinchange > 9999 || pinchange < 1000)
-			to_chat(usr, "<span class='warning'>[name], you must have a 4 digit number for a pin and be between 1000 and 9999.</span>")
+			to_chat(usr, "<span class='warning'>[src], you must have a 4 digit number for a pin and be between 1000 and 9999.</span>")
 			return
 		if(pinchange)
 			var/pinchange2 = input(user, "Confirm pin", "Confirm pin") as num|null //time to confirm!
 			if(pinchange == pinchange2)
 				var/obj/item/card/id/idcard = held_card
 				idcard.registered_account.account_pin = pinchange
-				to_chat(usr, "<span class='notice'>[name] beeps, your pin has been changed to [pinchange]!.</span>")
+				to_chat(usr, "<span class='notice'>[src] beeps, your pin has been changed to [pinchange]!.</span>")
 			else
-				to_chat(usr, "<span class='warning'>[name] buzzes, your pins did not match!</span>")
+				to_chat(usr, "<span class='warning'>[src] buzzes, your pins did not match!</span>")
 		pin = ""
 
 	if(href_list["withdraw"])

From 7b9f638832ab6c31e32b726e1f7dec1079aac486 Mon Sep 17 00:00:00 2001
From: DragonTrance <dylan661993@gmail.com>
Date: Thu, 9 Jun 2022 18:43:02 -0400
Subject: [PATCH 19/19] get ratio'd

---
 code/controllers/configuration/entries/game_options.dm | 2 +-
 config/game_options.txt                                | 6 +++---
 hyperstation/code/controllers/subsystem/economy.dm     | 5 ++++-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/code/controllers/configuration/entries/game_options.dm b/code/controllers/configuration/entries/game_options.dm
index dfa6f0041..f9fa2cdec 100644
--- a/code/controllers/configuration/entries/game_options.dm
+++ b/code/controllers/configuration/entries/game_options.dm
@@ -390,7 +390,7 @@
 	min_val = 0
 
 /datum/config_entry/number/economy_base_pay_ratio
-	config_entry_value = 3
+	config_entry_value = 6
 	min_val = 1
 
 /datum/config_entry/number/economy_price_multiplier
diff --git a/config/game_options.txt b/config/game_options.txt
index 1d4977749..8bf910cd8 100644
--- a/config/game_options.txt
+++ b/config/game_options.txt
@@ -595,8 +595,8 @@ BOX_RANDOM_ENGINE Box P.A.C.M.A.N,0
 # The base amount of credits, before any math whatsoever gets involved, that paychecks give
 ECONOMY_BASE_PAYMENT 60
 
-# The base pay for paychecks get divided by this amount. Useful for slowing down the rate of payment.
-ECONOMY_BASE_PAY_RATIO 3
+# How many paychecks the crew gets when first joining the station. Adds 1 if this is the start of the round, because of how subsystems work
+ECONOMY_BASE_PAY_RATIO 6
 
 # The default multiplier for a paycheck if nothing is assigned to a specific job.
 # You're allowed to set specific jobs a specific type of pay multiplier with ECONOMY_JOB_RATE
@@ -627,4 +627,4 @@ ECONOMY_PRICE_EXPENSIVE_AF 90
 
 # A multiplier to the prices of items inside vendors. Avoid setting this higher than the Assistant's paycheck multiplier if possible
 # This scales every item found in vendors. If you want to change an individual item, you have to change it through code
-ECONOMY_PRICE_MULTIPLIER 1.25
+ECONOMY_PRICE_MULTIPLIER 1.35
diff --git a/hyperstation/code/controllers/subsystem/economy.dm b/hyperstation/code/controllers/subsystem/economy.dm
index 9627e9ef1..7a71bc1fb 100644
--- a/hyperstation/code/controllers/subsystem/economy.dm
+++ b/hyperstation/code/controllers/subsystem/economy.dm
@@ -12,6 +12,7 @@ SUBSYSTEM_DEF(economy)
 /// Updates the prices from the config. Assorted into this individual proc instead of Initialize() so testers can change the config mid-round
 /// without having to initialize the economy SS again
 /datum/controller/subsystem/economy/proc/UpdatePrices()
+	roundstart_paychecks
 	prices_by_type = list()
 	prices_by_type += CONFIG_GET(number/economy_price_default)	//ECONOMY_PRICE_DEFAULT.. 1
 	prices_by_type += CONFIG_GET(number/economy_price_low)		//ECONOMY_PRICE_LOW.. 2
@@ -22,7 +23,9 @@ SUBSYSTEM_DEF(economy)
 	prices_by_type += 0 //ECONOMY_PRICE_FORCED_FREE.. 7
 
 /datum/controller/subsystem/economy/Initialize()
-	UpdatePrices()
+	roundstart_paychecks = CONFIG_GET(number/economy_base_pay_ratio)
+	if(!prices_by_type)
+		UpdatePrices()
 	return ..()
 
 /datum/controller/subsystem/economy/fire()