reworking economy, adding paychecks

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
 

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'>"

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.

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