From e3a3462b857a07962659c058007dd444e8f5f5e9 Mon Sep 17 00:00:00 2001 From: shellspeed1 Date: Tue, 20 Sep 2022 13:37:14 -0700 Subject: [PATCH] bounty bugfix --- code/game/machinery/civilian_bountys.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/civilian_bountys.dm b/code/game/machinery/civilian_bountys.dm index e983afeed1..5bcf0a8c76 100644 --- a/code/game/machinery/civilian_bountys.dm +++ b/code/game/machinery/civilian_bountys.dm @@ -109,7 +109,7 @@ if(!inserted_scan_id || !inserted_scan_id.registered_account) return var/datum/bank_account/pot_acc = inserted_scan_id.registered_account - if(pot_acc.civilian_bounty && ((world.time) < pot_acc.bounty_timer + 5 MINUTES)) + if((pot_acc.civilian_bounty && ((world.time) < pot_acc.bounty_timer + 5 MINUTES)) || pot_acc.bounties) var/curr_time = round(((pot_acc.bounty_timer + (5 MINUTES))-world.time)/ (1 MINUTES), 0.01) to_chat(usr, "Internal ID network spools coiling, try again in [curr_time] minutes!") return FALSE @@ -123,7 +123,7 @@ pot_acc.bounties = crumbs /obj/machinery/computer/piratepad_control/civilian/proc/pick_bounty(choice) - if(inserted_scan_id?.registered_account) + if(!inserted_scan_id?.registered_account) playsound(loc, 'sound/machines/synth_no.ogg', 40 , TRUE) return inserted_scan_id.registered_account.civilian_bounty = inserted_scan_id.registered_account.bounties[choice]