cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 20:48:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Vending machines double check for ID (#26978)

Browse Source 
* Vending machines double check for ID (#82126)

## About The Pull Request
- Fixes #82097

By double check i mean
- First check in the UI(Front End) if the ID suddenly became
unavailable, if so, update its status
- Check again in the back end & if payment failed reset `vend_ready =
TRUE` so we can try again. This is what caused the machine to
permanently get bricked

## Changelog
🆑
fix: Vending machines will update its UI if ID is lost at any point
fix: Vending machines won't brick if the payment fails (like due to lose
of ID) for any reason
/🆑

* Vending machines double check for ID

---------

Co-authored-by: SyncIt21 <110812394+SyncIt21@users.noreply.github.com>
This commit is contained in:
SkyratBot
2024-03-23 16:49:44 -04:00
committed by GitHub
co-authored by SyncIt21
parent 5a7e8fea2f
commit a8cfcd0bfd
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/vending/_vending.dm
+15 -7
View File
@@ -1249,16 +1249,20 @@ GLOBAL_LIST_EMPTY(vending_machines_to_restock)
var/mob/living/living_user = user
card_used = living_user.get_idcard(TRUE)
held_cash = living_user.tally_physical_credits()
var/list/user_data = null
if(card_used?.registered_account)
.["user"] = list()
.["user"]["name"] = card_used.registered_account.account_holder
.["user"]["cash"] = fetch_balance_to_use(card_used) + held_cash
user_data = list()
user_data["name"] = card_used.registered_account.account_holder
user_data["cash"] = fetch_balance_to_use(card_used) + held_cash
if(card_used.registered_account.account_job)
.["user"]["job"] = card_used.registered_account.account_job.title
.["user"]["department"] = card_used.registered_account.account_job.paycheck_department
user_data["job"] = card_used.registered_account.account_job.title
user_data["department"] = card_used.registered_account.account_job.paycheck_department
else
.["user"]["job"] = "No Job"
.["user"]["department"] = DEPARTMENT_UNASSIGNED
user_data["job"] = "No Job"
user_data["department"] = DEPARTMENT_UNASSIGNED
.["user"] = user_data
.["stock"] = list()
for (var/datum/data/vending_product/product_record as anything in product_records + coin_records + hidden_records)
@@ -1393,6 +1397,7 @@ GLOBAL_LIST_EMPTY(vending_machines_to_restock)
return
if(!proceed_payment(card_used, living_user, item_record, price_to_use))
vend_ready = TRUE
return
if(last_shopper != REF(usr) || purchase_message_cooldown < world.time)
@@ -1445,6 +1450,9 @@ GLOBAL_LIST_EMPTY(vending_machines_to_restock)
* price_to_use - price of the item we're trying to vend.
*/
/obj/machinery/vending/proc/proceed_payment(obj/item/card/id/paying_id_card, mob/living/mob_paying, datum/data/vending_product/product_to_vend, price_to_use)
if(QDELETED(paying_id_card)) //not available(null) or somehow is getting destroyed
speak("You do not possess an ID to purchase [product_to_vend.name].")
return FALSE
var/datum/bank_account/account = paying_id_card.registered_account
if(account.account_job && account.account_job.paycheck_department == payment_department)
price_to_use = max(round(price_to_use * DEPARTMENT_DISCOUNT), 1) //No longer free, but signifigantly cheaper.