From f1234d1d3fadf6b4fc5536bbcbb8c45710529a02 Mon Sep 17 00:00:00 2001 From: MrMelbert <51863163+MrMelbert@users.noreply.github.com> Date: Wed, 13 Aug 2025 18:03:33 -0500 Subject: [PATCH] Fix master skew (#92568) Yippee --- .../file_system/programs/civilian_bounty.dm | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/code/modules/modular_computers/file_system/programs/civilian_bounty.dm b/code/modules/modular_computers/file_system/programs/civilian_bounty.dm index c9e65be9cec..55bd6969af6 100644 --- a/code/modules/modular_computers/file_system/programs/civilian_bounty.dm +++ b/code/modules/modular_computers/file_system/programs/civilian_bounty.dm @@ -21,23 +21,23 @@ var/list/data = list() data["points"] = points data["status_report"] = status_report - data["id_inserted"] = computer.computer_id_slot - if(computer.computer_id_slot?.registered_account) - if(computer.computer_id_slot.registered_account.civilian_bounty) - data["id_bounty_info"] = computer.computer_id_slot.registered_account.civilian_bounty.description - data["id_bounty_num"] = computer.computer_id_slot.registered_account.bounty_num() - data["id_bounty_value"] = (computer.computer_id_slot.registered_account.civilian_bounty.reward) * (CIV_BOUNTY_SPLIT/100) - if(computer.computer_id_slot.registered_account.bounties) + data["id_inserted"] = computer.stored_id + if(computer.stored_id?.registered_account) + if(computer.stored_id.registered_account.civilian_bounty) + data["id_bounty_info"] = computer.stored_id.registered_account.civilian_bounty.description + data["id_bounty_num"] = computer.stored_id.registered_account.bounty_num() + data["id_bounty_value"] = (computer.stored_id.registered_account.civilian_bounty.reward) * (CIV_BOUNTY_SPLIT/100) + if(computer.stored_id.registered_account.bounties) data["picking"] = TRUE - data["id_bounty_names"] = list(computer.computer_id_slot.registered_account.bounties[1].name, - computer.computer_id_slot.registered_account.bounties[2].name, - computer.computer_id_slot.registered_account.bounties[3].name) - data["id_bounty_infos"] = list(computer.computer_id_slot.registered_account.bounties[1].description, - computer.computer_id_slot.registered_account.bounties[2].description, - computer.computer_id_slot.registered_account.bounties[3].description) - data["id_bounty_values"] = list(computer.computer_id_slot.registered_account.bounties[1].reward * (CIV_BOUNTY_SPLIT/100), - computer.computer_id_slot.registered_account.bounties[2].reward * (CIV_BOUNTY_SPLIT/100), - computer.computer_id_slot.registered_account.bounties[3].reward * (CIV_BOUNTY_SPLIT/100)) + data["id_bounty_names"] = list(computer.stored_id.registered_account.bounties[1].name, + computer.stored_id.registered_account.bounties[2].name, + computer.stored_id.registered_account.bounties[3].name) + data["id_bounty_infos"] = list(computer.stored_id.registered_account.bounties[1].description, + computer.stored_id.registered_account.bounties[2].description, + computer.stored_id.registered_account.bounties[3].description) + data["id_bounty_values"] = list(computer.stored_id.registered_account.bounties[1].reward * (CIV_BOUNTY_SPLIT/100), + computer.stored_id.registered_account.bounties[2].reward * (CIV_BOUNTY_SPLIT/100), + computer.stored_id.registered_account.bounties[3].reward * (CIV_BOUNTY_SPLIT/100)) else data["picking"] = FALSE @@ -54,7 +54,7 @@ ///Here is where cargo bounties are added to the player's bank accounts, then adjusted and scaled into a civilian bounty. /datum/computer_file/program/civilianbounties/proc/add_bounties(mob/user, cooldown_reduction = 0) - var/datum/bank_account/id_account = computer.computer_id_slot?.registered_account + var/datum/bank_account/id_account = computer.stored_id?.registered_account if(!id_account) return if((id_account.civilian_bounty || id_account.bounties) && !COOLDOWN_FINISHED(id_account, bounty_timer)) @@ -76,7 +76,7 @@ * @param choice The index of the bounty in the list of bounties that the player can choose from. */ /datum/computer_file/program/civilianbounties/proc/pick_bounty(datum/bounty/choice) - var/datum/bank_account/id_account = computer.computer_id_slot?.registered_account + var/datum/bank_account/id_account = computer.stored_id?.registered_account if(!id_account?.bounties?[choice]) playsound(computer.loc, 'sound/machines/synth/synth_no.ogg', 40 , TRUE) return