From 335c4e8f0382da126ce45b244b33bf695913f048 Mon Sep 17 00:00:00 2001 From: Timberpoes Date: Tue, 6 Apr 2021 08:34:55 +0100 Subject: [PATCH] Fixes a few roulette wheel runtimes. (#58139) Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com> --- code/game/machinery/roulette_machine.dm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/code/game/machinery/roulette_machine.dm b/code/game/machinery/roulette_machine.dm index 623ac458cfa..33821987a3f 100644 --- a/code/game/machinery/roulette_machine.dm +++ b/code/game/machinery/roulette_machine.dm @@ -71,16 +71,19 @@ data["IsAnchored"] = anchored data["BetAmount"] = chosen_bet_amount data["BetType"] = chosen_bet_type - data["HouseBalance"] = my_card?.registered_account.account_balance + data["HouseBalance"] = my_card?.registered_account?.account_balance || 0 data["LastSpin"] = last_spin data["Spinning"] = playing - var/mob/living/carbon/human/H = user - var/obj/item/card/id/C = H.get_idcard(TRUE) - if(C) - data["AccountBalance"] = C.registered_account.account_balance + + + if(ishuman(user)) + var/mob/living/carbon/human/human_user = user + var/obj/item/card/id/id_card = human_user.get_idcard(TRUE) + data["AccountBalance"] = id_card?.registered_account?.account_balance || 0 + data["CanUnbolt"] = (id_card == my_card) else data["AccountBalance"] = 0 - data["CanUnbolt"] = (C == my_card) + data["CanUnbolt"] = FALSE return data