diff --git a/code/modules/economy/cash_register.dm b/code/modules/economy/cash_register.dm index c07fcca660..07d49030f7 100644 --- a/code/modules/economy/cash_register.dm +++ b/code/modules/economy/cash_register.dm @@ -56,7 +56,8 @@ reset_memory() user << "You reset the machine's memory." else - custom_interface(user) + user.set_machine(src) + interact(user) /obj/machinery/cash_register/AltClick(mob/user) @@ -64,8 +65,8 @@ open_cash_box() -/obj/machinery/cash_register/proc/custom_interface(mob/user as mob) - var/dat = "

Retail Scanner

" +/obj/machinery/cash_register/interact(mob/user as mob) + var/dat = "

Cash Register

" if (locked) dat += "Unlock
" dat += "Linked account: [linked_account ? linked_account.owner_name : "None"]
" @@ -82,10 +83,17 @@ dat += locked ? "
" : "Reset Log
" dat += "
" dat += "Device ID: [machine_id]" - user << browse(dat, "window=retail;size=350x500") + user << browse(dat, "window=cash_register;size=350x500") + onclose(user, "cash_register") /obj/machinery/cash_register/Topic(var/href, var/href_list) + if(..()) + return + + usr.set_machine(src) + add_fingerprint(usr) + if(href_list["choice"]) switch(href_list["choice"]) if("toggle_lock") @@ -119,7 +127,7 @@ if("reset_log") transaction_logs.Cut() usr << "\icon[src]Transaction log reset." - custom_interface(usr) + updateDialog() @@ -323,7 +331,7 @@ transaction_purpose += "[O]: [price] Thaler\s" transaction_amount += price item_list += "[O]" - price_list += "[price] þ" + price_list += price // Animation and sound playsound(src, 'sound/machines/twobeep.ogg', 25) // Reset confirmation @@ -332,6 +340,7 @@ /obj/machinery/cash_register/proc/add_transaction_log(var/c_name, var/p_method, var/t_amount) var/dat = {" +