From 5717a497b8854981d0c677f2bb0613b3b8028f3f Mon Sep 17 00:00:00 2001 From: Bloop <13398309+vinylspiders@users.noreply.github.com> Date: Wed, 25 Sep 2024 02:27:54 -0400 Subject: [PATCH] Fixes an oversight with bank accounts (#86850) ## About The Pull Request Fixes this runtime: ![image](https://github.com/user-attachments/assets/7f4640a9-fbf0-4a5e-a51d-5ca1ebe22545) `account_job` can in fact be null it seems, and that should be taken into account. ## Why It's Good For The Game Fixes oversight ## Changelog Nothing player facing (probably?) --- code/controllers/subsystem/id_access.dm | 2 +- code/modules/economy/account.dm | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/code/controllers/subsystem/id_access.dm b/code/controllers/subsystem/id_access.dm index faa2df1050e..93b823f18b5 100644 --- a/code/controllers/subsystem/id_access.dm +++ b/code/controllers/subsystem/id_access.dm @@ -410,7 +410,7 @@ SUBSYSTEM_DEF(id_access) id_card.assignment = trim.assignment var/datum/job/trim_job = trim.find_job() - if (!isnull(trim_job) && !isnull(id_card.registered_account)) + if (!isnull(id_card.registered_account)) var/datum/job/old_job = id_card.registered_account.account_job id_card.registered_account.account_job = trim_job id_card.registered_account.update_account_job_lists(trim_job, old_job) diff --git a/code/modules/economy/account.dm b/code/modules/economy/account.dm index 5dd070f01bd..8ec8e5b2d8a 100644 --- a/code/modules/economy/account.dm +++ b/code/modules/economy/account.dm @@ -83,7 +83,8 @@ if(old_job) SSeconomy.bank_accounts_by_job[old_job.type] -= src - LAZYADD(SSeconomy.bank_accounts_by_job[new_job.type], src) + if(new_job) + LAZYADD(SSeconomy.bank_accounts_by_job[new_job.type], src) /datum/bank_account/vv_edit_var(var_name, var_value) // just so you don't have to do it manually var/old_id = account_id