[MIRROR] VIP gets their own department budget than the civilian budget, and gets paid from it. (+department account lock feature)

code/__DEFINES/economy.dm

@@ -6,7 +6,13 @@
 #define PAYCHECK_MEDIUM 40
 #define PAYCHECK_HARD 70
 #define PAYCHECK_COMMAND 100
-#define PAYCHECK_VIP 250
+#define PAYCHECK_VIP 2000
+/*	Note: The current intention for crazy amount of money to VIP is that they can be a rich shitter
+		  or be targeted by antags for their money - oh, my, being rich isn't always good.
+		  The first buff to their money was to 2,000 credits. Nerf is fine if you think it's necessary,
+		  but if you decrease their payment too much, they'll be no longer interested.
+		  I recommend to nerf their gimmick spawn chance instead. */
+
 
 #define PAYCHECK_WELFARE 20 //NEETbucks
 
@@ -24,5 +30,7 @@
 #define ACCOUNT_CAR_NAME "Cargo Budget"
 #define ACCOUNT_SEC "SEC"
 #define ACCOUNT_SEC_NAME "Defense Budget"
+#define ACCOUNT_VIP "VIP"
+#define ACCOUNT_VIP_NAME "Nanotrasen VIP Expense Account Budget"
 
 #define NO_FREEBIES "commies go home"

code/__HELPERS/jobs.dm

@@ -0,0 +1,316 @@
+// This proc is only used in `PDApainter.dm`, but for better readability, it's declared as global proc and stored here.
+// This returns a card icon style by given job name. Check `card.dmi` for the card list.
+/proc/get_cardstyle_by_jobname(jobname)
+	if(!jobname)
+		CRASH("The proc has taken a null value")
+
+	var/static/id_style = list(
+		// Command
+		"Command (Custom)" = "captain",
+		JOB_NAME_CAPTAIN = "captain",
+		"Acting Captain" = "captain",
+		// Service
+		"Service (Custom)" = "rawservice",
+		JOB_NAME_HEADOFPERSONNEL = "hop",
+		JOB_NAME_ASSISTANT = "id",
+		JOB_NAME_BOTANIST = "serv",
+		JOB_NAME_BARTENDER = "serv",
+		JOB_NAME_COOK = "serv",
+		JOB_NAME_JANITOR = "janitor",
+		JOB_NAME_CURATOR = "chap",
+		JOB_NAME_CHAPLAIN = "chap",
+		JOB_NAME_LAWYER = "lawyer",
+		JOB_NAME_CLOWN = "clown",
+		JOB_NAME_MIME = "mime",
+		JOB_NAME_STAGEMAGICIAN = "serv",
+		JOB_NAME_BARBER = "serv",
+		// Cargo
+		"Cargo (Custom)" = "rawcargo",
+		JOB_NAME_QUARTERMASTER = "qm",
+		JOB_NAME_CARGOTECHNICIAN = "cargo",
+		JOB_NAME_SHAFTMINER = "miner",
+		// Engineering
+		"Engineering (Custom)" = "rawengineering",
+		JOB_NAME_CHIEFENGINEER = "ce",
+		JOB_NAME_STATIONENGINEER = "engi",
+		JOB_NAME_ATMOSPHERICTECHNICIAN = "atmos",
+		// Medical
+		"Medical (Custom)" = "rawmedical",
+		JOB_NAME_CHIEFMEDICALOFFICER = "cmo",
+		JOB_NAME_MEDICALDOCTOR = "med",
+		JOB_NAME_PARAMEDIC = "paramed",
+		JOB_NAME_VIROLOGIST = "viro",
+		JOB_NAME_GENETICIST = "gene",
+		JOB_NAME_CHEMIST = "chemist",
+		JOB_NAME_PSYCHIATRIST = "med",
+		// R&D
+		"Science (Custom)" = "rawscience",
+		JOB_NAME_RESEARCHDIRECTOR = "rd",
+		JOB_NAME_SCIENTIST = "sci",
+		JOB_NAME_ROBOTICIST = "roboticist",
+		JOB_NAME_EXPLORATIONCREW = "exploration",
+		// Security
+		"Security (Custom)" = "rawsecurity",
+		JOB_NAME_HEADOFSECURITY = "hos",
+		JOB_NAME_WARDEN = "warden",
+		JOB_NAME_SECURITYOFFICER = "sec",
+		JOB_NAME_DETECTIVE = "detective",
+		JOB_NAME_BRIGPHYSICIAN = "brigphys",
+		JOB_NAME_DEPUTY = "deputy",
+		// ETC
+		"Unassigned" = "id",
+		JOB_NAME_PRISONER = "orange",
+		// EMAG
+		"CentCom (Custom)" = "centcom",
+		"CentCom" = "centcom",
+		"ERT" = "ert",
+		JOB_NAME_VIP = "gold",
+		JOB_NAME_KING = "gold",
+		"Syndicate" = "syndicate",
+		"Clown Operative" = "clown_op",
+		"Unknown" = "unknown",
+		// ETC2
+		"Ratvar" = "ratvar"
+	)
+	return id_style[jobname] || "noname" // default: a card with no shape
+
+// This returns a hud icon (from `hud.dmi`) by given job name.
+// Some custom title is from `PDApainter.dm`. You neec to check it if you're going to remove custom job.
+/proc/get_hud_by_jobname(jobname)
+	if(!jobname)
+		CRASH("The proc has taken a null value")
+
+	var/static/id_to_hud = list(
+		// Command
+		"Command (Custom)" = JOB_HUD_RAWCOMMAND,
+		JOB_NAME_CAPTAIN = JOB_HUD_CAPTAIN,
+		"Acting Captain" = JOB_HUD_ACTINGCAPTAIN ,
+
+		// Service
+		"Service (Custom)" = JOB_HUD_RAWSERVICE,
+		JOB_NAME_HEADOFPERSONNEL = JOB_HUD_HEADOFPERSONNEL,
+		JOB_NAME_ASSISTANT = JOB_HUD_ASSISTANT,
+		JOB_NAME_BARTENDER = JOB_HUD_BARTENDER,
+		JOB_NAME_COOK = JOB_HUD_COOK,
+		JOB_NAME_BOTANIST = JOB_HUD_BOTANIST,
+		JOB_NAME_CURATOR = JOB_HUD_CURATOR,
+		JOB_NAME_CHAPLAIN = JOB_HUD_CHAPLAIN,
+		JOB_NAME_JANITOR = JOB_HUD_JANITOR,
+		JOB_NAME_LAWYER = JOB_HUD_LAWYER,
+		JOB_NAME_MIME = JOB_HUD_MIME,
+		JOB_NAME_CLOWN = JOB_HUD_CLOWN,
+		JOB_NAME_STAGEMAGICIAN = JOB_HUD_STAGEMAGICIAN,
+		JOB_NAME_BARBER = JOB_HUD_BARBER,
+
+		// Cargo
+		"Cargo (Custom)" = JOB_HUD_RAWCARGO,
+		JOB_NAME_QUARTERMASTER = JOB_HUD_QUARTERMASTER,
+		JOB_NAME_CARGOTECHNICIAN = JOB_HUD_CARGOTECHNICIAN,
+		JOB_NAME_SHAFTMINER = JOB_HUD_SHAFTMINER,
+
+		// Engineering
+		"Engineering (Custom)" = JOB_HUD_RAWENGINEERING,
+		JOB_NAME_CHIEFENGINEER = JOB_HUD_CHIEFENGINEER,
+		JOB_NAME_STATIONENGINEER = JOB_HUD_STATIONENGINEER,
+		JOB_NAME_ATMOSPHERICTECHNICIAN = JOB_HUD_ATMOSPHERICTECHNICIAN,
+
+		// Medical
+		"Medical (Custom)" = JOB_HUD_RAWMEDICAL,
+		JOB_NAME_CHIEFMEDICALOFFICER = JOB_HUD_CHEIFMEDICALOFFICIER,
+		JOB_NAME_MEDICALDOCTOR = JOB_HUD_MEDICALDOCTOR,
+		JOB_NAME_PARAMEDIC = JOB_HUD_PARAMEDIC,
+		JOB_NAME_VIROLOGIST = JOB_HUD_VIROLOGIST,
+		JOB_NAME_CHEMIST = JOB_HUD_CHEMIST,
+		JOB_NAME_GENETICIST = JOB_HUD_GENETICIST,
+		JOB_NAME_PSYCHIATRIST = JOB_HUD_PSYCHIATRIST,
+
+		// R&D
+		"Science (Custom)" = JOB_HUD_RAWSCIENCE,
+		JOB_NAME_RESEARCHDIRECTOR = JOB_HUD_RESEARCHDIRECTOR,
+		JOB_NAME_SCIENTIST = JOB_HUD_SCIENTIST,
+		JOB_NAME_ROBOTICIST = JOB_HUD_ROBOTICIST,
+		JOB_NAME_EXPLORATIONCREW = JOB_HUD_EXPLORATIONCREW,
+
+		// Security
+		"Security (Custom)" = JOB_HUD_RAWSECURITY,
+		JOB_NAME_HEADOFSECURITY = JOB_HUD_HEADOFSECURITY,
+		JOB_NAME_SECURITYOFFICER = JOB_HUD_SECURITYOFFICER,
+		JOB_NAME_WARDEN = JOB_HUD_WARDEN,
+		JOB_NAME_DETECTIVE = JOB_HUD_DETECTIVE,
+		JOB_NAME_BRIGPHYSICIAN = JOB_HUD_BRIGPHYSICIAN,
+		JOB_NAME_DEPUTY = JOB_HUD_DEPUTY,
+
+		// CentCom
+		"CentCom (Custom)" = JOB_HUD_RAWCENTCOM,
+		"CentCom" = JOB_HUD_CENTCOM,
+		"ERT" = JOB_HUD_CENTCOM,
+
+		// ETC
+		JOB_NAME_VIP = JOB_HUD_VIP,
+		JOB_NAME_KING = JOB_HUD_KING,
+		"Syndicate" = JOB_HUD_SYNDICATE,
+		"Clown Operative" = JOB_HUD_SYNDICATE,
+		"Unassigned" = JOB_HUD_UNKNOWN,
+		JOB_NAME_PRISONER = JOB_HUD_PRISONER
+	)
+	return id_to_hud[jobname] || JOB_HUD_UNKNOWN // default: a grey unknown hud
+
+// This returns a department for banking system by given hud icon.
+// currently used in `card.dm` and `PDApainter.dm` to set a card's paycheck department
+/proc/get_department_by_hud(jobname)
+	if(!jobname)
+		CRASH("The proc has taken a null value")
+
+	var/static/hud_to_department_acc = list(
+		// Command
+		JOB_HUD_RAWCOMMAND = ACCOUNT_SEC,
+		JOB_HUD_CAPTAIN = ACCOUNT_SEC,
+		JOB_HUD_ACTINGCAPTAIN = ACCOUNT_SEC,
+
+		// Service + Civilian
+		JOB_HUD_RAWSERVICE = ACCOUNT_SRV,
+		JOB_HUD_HEADOFPERSONNEL = ACCOUNT_SRV,
+		JOB_HUD_ASSISTANT = ACCOUNT_CIV,
+		JOB_HUD_BARTENDER = ACCOUNT_SRV,
+		JOB_HUD_COOK = ACCOUNT_SRV,
+		JOB_HUD_BOTANIST = ACCOUNT_SRV,
+		JOB_HUD_CURATOR = ACCOUNT_CIV,
+		JOB_HUD_CHAPLAIN = ACCOUNT_CIV,
+		JOB_HUD_JANITOR = ACCOUNT_SRV,
+		JOB_HUD_LAWYER = ACCOUNT_CIV,
+		JOB_HUD_MIME = ACCOUNT_SRV,
+		JOB_HUD_CLOWN = ACCOUNT_SRV,
+		JOB_HUD_STAGEMAGICIAN = ACCOUNT_SRV,
+		JOB_HUD_BARBER = ACCOUNT_CIV,
+
+		// Cargo
+		JOB_HUD_RAWCARGO = ACCOUNT_CAR,
+		JOB_HUD_QUARTERMASTER = ACCOUNT_CAR,
+		JOB_HUD_CARGOTECHNICIAN = ACCOUNT_CAR,
+		JOB_HUD_SHAFTMINER = ACCOUNT_CAR,
+
+		// Engineering
+		JOB_HUD_RAWENGINEERING = ACCOUNT_ENG,
+		JOB_HUD_CHIEFENGINEER = ACCOUNT_ENG,
+		JOB_HUD_STATIONENGINEER = ACCOUNT_ENG,
+		JOB_HUD_ATMOSPHERICTECHNICIAN = ACCOUNT_ENG,
+
+		// Medical
+		JOB_HUD_RAWMEDICAL = ACCOUNT_MED,
+		JOB_HUD_CHEIFMEDICALOFFICIER = ACCOUNT_MED,
+		JOB_HUD_MEDICALDOCTOR = ACCOUNT_MED,
+		JOB_HUD_PARAMEDIC = ACCOUNT_MED,
+		JOB_HUD_VIROLOGIST = ACCOUNT_MED,
+		JOB_HUD_CHEMIST = ACCOUNT_MED,
+		JOB_HUD_GENETICIST = ACCOUNT_MED,
+		JOB_HUD_PSYCHIATRIST = ACCOUNT_MED,
+
+		// R&D
+		JOB_HUD_RAWSCIENCE = ACCOUNT_SCI,
+		JOB_HUD_RESEARCHDIRECTOR = ACCOUNT_SCI,
+		JOB_HUD_SCIENTIST = ACCOUNT_SCI,
+		JOB_HUD_ROBOTICIST = ACCOUNT_SCI,
+		JOB_HUD_EXPLORATIONCREW = ACCOUNT_SCI,
+
+		// Security
+		JOB_HUD_RAWSECURITY = ACCOUNT_SEC,
+		JOB_HUD_HEADOFSECURITY = ACCOUNT_SEC,
+		JOB_HUD_SECURITYOFFICER = ACCOUNT_SEC,
+		JOB_HUD_WARDEN = ACCOUNT_SEC,
+		JOB_HUD_DETECTIVE = ACCOUNT_SEC,
+		JOB_HUD_BRIGPHYSICIAN = ACCOUNT_SEC,
+		JOB_HUD_DEPUTY = ACCOUNT_SEC,
+
+		// CentCom
+		JOB_HUD_RAWCENTCOM = ACCOUNT_CIV,
+		JOB_HUD_CENTCOM = ACCOUNT_CIV,
+
+		// ETC
+		JOB_HUD_VIP = ACCOUNT_CIV, // Fake VIP gets a station department
+		JOB_HUD_KING = ACCOUNT_CIV,
+		JOB_HUD_SYNDICATE = ACCOUNT_CIV,
+		JOB_HUD_UNKNOWN = ACCOUNT_CIV,
+		JOB_HUD_PRISONER = ACCOUNT_CIV
+	)
+	return hud_to_department_acc[jobname] || ACCOUNT_CIV // default: Civ budget department
+
+// used to determine chat color by HUD in `chatmessage.dm`
+// Note: custom colors are what I really didn't put much attention into. feel free to change its color when you feel off.
+/datum/chatmessage/proc/get_chatcolor_by_hud(jobname)
+	if(!jobname)
+		CRASH("The proc has taken a null value")
+
+	var/static/hud_to_chatcolor = list(
+		// Command
+		JOB_HUD_RAWCOMMAND = JOB_CHATCOLOR_RAWCOMMAND,
+		JOB_HUD_CAPTAIN = JOB_CHATCOLOR_CAPTAIN,
+		JOB_HUD_ACTINGCAPTAIN  = JOB_CHATCOLOR_ACTINGCAPTAIN,
+
+		// Service
+		JOB_HUD_RAWSERVICE = JOB_CHATCOLOR_RAWSERVICE,
+		JOB_HUD_HEADOFPERSONNEL = JOB_CHATCOLOR_HEADOFPERSONNEL,
+		JOB_HUD_ASSISTANT = JOB_CHATCOLOR_ASSISTANT,
+		JOB_HUD_BARTENDER = JOB_CHATCOLOR_BARTENDER,
+		JOB_HUD_COOK = JOB_CHATCOLOR_COOK,
+		JOB_HUD_BOTANIST = JOB_CHATCOLOR_BOTANIST,
+		JOB_HUD_CURATOR = JOB_CHATCOLOR_CURATOR,
+		JOB_HUD_CHAPLAIN = JOB_CHATCOLOR_CHAPLAIN,
+		JOB_HUD_JANITOR = JOB_CHATCOLOR_JANITOR,
+		JOB_HUD_LAWYER = JOB_CHATCOLOR_LAWYER,
+		JOB_HUD_MIME = JOB_CHATCOLOR_MIME,
+		JOB_HUD_CLOWN = JOB_CHATCOLOR_CLOWN,
+		JOB_HUD_STAGEMAGICIAN = JOB_CHATCOLOR_STAGEMAGICIAN,
+		JOB_HUD_BARBER = JOB_CHATCOLOR_BARBER,
+
+		// Cargo
+		JOB_HUD_RAWCARGO = JOB_CHATCOLOR_RAWCARGO,
+		JOB_HUD_QUARTERMASTER = JOB_CHATCOLOR_QUARTERMASTER,
+		JOB_HUD_CARGOTECHNICIAN = JOB_CHATCOLOR_CARGOTECHNICIAN,
+		JOB_HUD_SHAFTMINER = JOB_CHATCOLOR_SHAFTMINER,
+
+		// Engineering
+		JOB_HUD_RAWENGINEERING = JOB_CHATCOLOR_RAWENGINEERING,
+		JOB_HUD_CHIEFENGINEER = JOB_CHATCOLOR_CHIEFENGINEER,
+		JOB_HUD_STATIONENGINEER = JOB_CHATCOLOR_STATIONENGINEER,
+		JOB_HUD_ATMOSPHERICTECHNICIAN = JOB_CHATCOLOR_ATMOSPHERICTECHNICIAN,
+
+		// Medical
+		JOB_HUD_RAWMEDICAL = JOB_CHATCOLOR_RAWMEDICAL,
+		JOB_HUD_CHEIFMEDICALOFFICIER = JOB_CHATCOLOR_CHEIFMEDICALOFFICIER,
+		JOB_HUD_MEDICALDOCTOR = JOB_CHATCOLOR_MEDICALDOCTOR,
+		JOB_HUD_PARAMEDIC = JOB_CHATCOLOR_PARAMEDIC,
+		JOB_HUD_VIROLOGIST = JOB_CHATCOLOR_VIROLOGIST,
+		JOB_HUD_CHEMIST = JOB_CHATCOLOR_CHEMIST,
+		JOB_HUD_GENETICIST = JOB_CHATCOLOR_GENETICIST,
+		JOB_HUD_PSYCHIATRIST = JOB_CHATCOLOR_PSYCHIATRIST,
+
+		// R&D
+		JOB_HUD_RAWSCIENCE = JOB_CHATCOLOR_RAWSCIENCE,
+		JOB_HUD_RESEARCHDIRECTOR = JOB_CHATCOLOR_RESEARCHDIRECTOR,
+		JOB_HUD_SCIENTIST = JOB_CHATCOLOR_SCIENTIST,
+		JOB_HUD_ROBOTICIST = JOB_CHATCOLOR_ROBOTICIST,
+		JOB_HUD_EXPLORATIONCREW = JOB_CHATCOLOR_EXPLORATIONCREW,
+
+		// Security
+		JOB_HUD_RAWSECURITY = JOB_CHATCOLOR_RAWSECURITY,
+		JOB_HUD_HEADOFSECURITY = JOB_CHATCOLOR_HEADOFSECURITY,
+		JOB_HUD_WARDEN = JOB_CHATCOLOR_WARDEN,
+		JOB_HUD_SECURITYOFFICER = JOB_CHATCOLOR_SECURITYOFFICER,
+		JOB_HUD_DETECTIVE = JOB_CHATCOLOR_DETECTIVE,
+		JOB_HUD_BRIGPHYSICIAN = JOB_CHATCOLOR_BRIGPHYSICIAN,
+		JOB_HUD_DEPUTY = JOB_CHATCOLOR_DEPUTY,
+
+		// CentCom
+		JOB_HUD_RAWCENTCOM = JOB_CHATCOLOR_RAWCENTCOM,
+		JOB_HUD_CENTCOM = JOB_CHATCOLOR_CENTCOM,
+
+		// ETC
+		JOB_HUD_VIP = JOB_CHATCOLOR_VIP,
+		JOB_HUD_KING = JOB_CHATCOLOR_KING,
+		JOB_HUD_SYNDICATE = JOB_CHATCOLOR_SYNDICATE,
+		JOB_HUD_NOTCENTCOM = JOB_CHATCOLOR_NOTCENTCOM,
+		JOB_HUD_PRISONER = JOB_CHATCOLOR_PRISONER,
+		JOB_HUD_UNKNOWN = JOB_CHATCOLOR_UNKNOWN
+	)
+	return hud_to_chatcolor[jobname] || JOB_CHATCOLOR_UNKNOWN
+

code/controllers/subsystem/economy.dm

@@ -1,3 +1,5 @@
+#define VIP_BUDGET_BASE rand(8888888, 11111111)
+
 SUBSYSTEM_DEF(economy)
 	name = "Economy"
 	wait = 5 MINUTES
@@ -12,6 +14,7 @@ SUBSYSTEM_DEF(economy)
 										ACCOUNT_SRV = ACCOUNT_SRV_NAME,
 										ACCOUNT_CAR = ACCOUNT_CAR_NAME,
 										ACCOUNT_SEC = ACCOUNT_SEC_NAME)
+	var/list/nonstation_accounts = list(ACCOUNT_VIP = ACCOUNT_VIP_NAME)
 	var/list/generated_accounts = list()
 	var/full_ancap = FALSE // Enables extra money charges for things that normally would be free, such as sleepers/cryo/cloning.
 							//Take care when enabling, as players will NOT respond well if the economy is set up for low cash flows.
@@ -25,6 +28,8 @@ SUBSYSTEM_DEF(economy)
 	var/budget_to_hand_out = round(budget_pool / department_accounts.len)
 	for(var/A in department_accounts)
 		new /datum/bank_account/department(A, budget_to_hand_out)
+	for(var/A in nonstation_accounts)
+		new /datum/bank_account/department(A, VIP_BUDGET_BASE)
 	return ..()
 
 /datum/controller/subsystem/economy/Recover()
@@ -85,3 +90,9 @@ SUBSYSTEM_DEF(economy)
 	sci?.adjust_money(science_cash)
 	civ?.adjust_money(civilian_cash)
 	car?.adjust_money(cargo_cash)
+
+	// VIP budget will not dry
+	var/datum/bank_account/vip = get_dep_account(ACCOUNT_VIP)
+	vip?.adjust_money(cargo_cash)
+
+#undef VIP_BUDGET_BASE

code/game/machinery/PDApainter.dm

@@ -220,7 +220,19 @@
 					return
 				if(!storedid)//is the ID still there?
 					return
+<<<<<<< HEAD
 				storedid.icon_state = id_icons[newidskin]
+=======
+				storedid.icon_state = get_cardstyle_by_jobname(newidskin)
+				storedid.hud_state = get_hud_by_jobname(newidskin)
+
+				// QoL to correct the system behavior
+				if(storedid.registered_account)
+					if(!storedid.registered_account.department_locked)
+						storedid.registered_account.account_department = get_department_by_hud(storedid.hud_state) // your true department by your hud icon color
+				GLOB.data_core.manifest_modify(storedid.registered_name, storedid.assignment, storedid.hud_state) // update crew manifest
+				// There are the same code lines in `card.dm`
+>>>>>>> 2ee586c7bc... VIP gets their own department budget than the civilian budget, and gets paid from it. (+department account lock feature) (#7330)
 				ejectid()
 		else
 			to_chat(user, "<span class='notice'>[src] is empty.</span>")