diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm index dbadf81eb5d..a0da955caef 100644 --- a/code/game/objects/items/cards_ids.dm +++ b/code/game/objects/items/cards_ids.dm @@ -175,9 +175,7 @@ return if(!user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK)) return - if(user.get_active_held_item() != src) - to_chat(user, "You must hold the ID in your hand to do this.") - return + return TRUE /obj/item/card/id/AltClick(mob/living/user) @@ -199,8 +197,9 @@ return to_chat(user, "The account ID number provided is invalid.") return - var/amount_to_remove = input(user, "How much do you want to withdraw?", "Account Reclamation", 5) as num + var/amount_to_remove = input(user, "How much do you want to withdraw? Current Balance: [registered_account.account_balance]", "Withdraw Funds", 5) as num if(!amount_to_remove || amount_to_remove < 0) + to_chat(user, "You're pretty sure that's not how money works.") return if(!alt_click_can_use_id(user)) return @@ -210,7 +209,8 @@ to_chat(user, "You withdraw [amount_to_remove] credits into a holochip.") return else - to_chat(user, "The linked account doesn't have the funds for that.") + var/difference = amount_to_remove - registered_account.account_balance + registered_account.bank_card_talk("ERROR: The linked account requires [difference] more credit\s to perform that withdrawal.", TRUE) /obj/item/card/id/examine(mob/user) ..() @@ -222,7 +222,7 @@ var/datum/bank_account/D = SSeconomy.get_dep_account(registered_account.account_job.paycheck_department) if(D) to_chat(user, "The [D.account_holder] reports a balance of $[D.account_balance].") - to_chat(user, "Alt-Click the ID while holding it to pull money from the linked account in the form of holochips.") + to_chat(user, "Alt-Click the ID to pull money from the linked account in the form of holochips.") to_chat(user, "You can insert credits into the linked account by pressing holochips, cash, or coins against the ID.") if(registered_account.account_holder == user.real_name) to_chat(user, "If you lose this ID card, you can reclaim your account by Alt-Clicking a blank ID card while holding it and entering your account ID number.")