From 7727e3f670e84d3a93f37b71e6327556449faf2a Mon Sep 17 00:00:00 2001 From: Henri215 <77684085+Henri215@users.noreply.github.com> Date: Sat, 4 Feb 2023 20:32:22 -0300 Subject: [PATCH] Fix #20268 Vendor dispense change fixes (#20277) * Dispensing credits from a vendor without ID * fixing spacing * dispensing cash when destroyed * Update tgui/packages/tgui/interfaces/Vending.js Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com> * Moving to obj break * Update code/game/machinery/vendors/vending.dm Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com> * useless blank line --------- Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com> --- code/game/machinery/vendors/vending.dm | 4 ++++ tgui/packages/tgui/interfaces/Vending.js | 4 +++- tgui/packages/tgui/public/tgui.bundle.js | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/vendors/vending.dm b/code/game/machinery/vendors/vending.dm index fa860051b1f..39c2c4f3124 100644 --- a/code/game/machinery/vendors/vending.dm +++ b/code/game/machinery/vendors/vending.dm @@ -748,6 +748,10 @@ set_light(0) update_icon(UPDATE_OVERLAYS) + if(cash_transaction) + new /obj/item/stack/spacecash(get_turf(src), cash_transaction) + cash_transaction = 0 + var/dump_amount = 0 var/found_anything = TRUE while(found_anything) diff --git a/tgui/packages/tgui/interfaces/Vending.js b/tgui/packages/tgui/interfaces/Vending.js index 1ff6d3d2254..535fb09b3c2 100644 --- a/tgui/packages/tgui/interfaces/Vending.js +++ b/tgui/packages/tgui/interfaces/Vending.js @@ -106,6 +106,9 @@ export const Vending = (props, context) => {
Your balance is {usermoney} credits.
+ + ))} + There is {inserted_cash} credits of space cash inserted.