diff --git a/baystation12.int b/baystation12.int index 28f433f0ff..7a7333c52f 100644 --- a/baystation12.int +++ b/baystation12.int @@ -1,6 +1,11 @@ // BEGIN_INTERNALS /* MAP_ICON_TYPE: 0 +WINDOW: code\modules\economy\EFTPOS.dm;code\modules\economy\cash.dm;icons\obj\items.dmi +LAST_COMPILE_VERSION: 504.1234 +DIR: code code\game code\game\gamemodes code\game\gamemodes\revolution code\game\gamemodes\traitor code\game\machinery code\modules code\modules\economy code\modules\reagents\reagent_containers icons icons\obj +FILE: code\modules\economy\cash.dm +LAST_COMPILE_TIME: 1397694119 AUTO_FILE_DIR: OFF */ -// END_INTERNALS \ No newline at end of file +// END_INTERNALS diff --git a/code/modules/economy/EFTPOS.dm b/code/modules/economy/EFTPOS.dm index d13d62aa46..3812ab70c6 100644 --- a/code/modules/economy/EFTPOS.dm +++ b/code/modules/economy/EFTPOS.dm @@ -84,7 +84,7 @@ var/dat = "[eftpos_name]
" dat += "This terminal is [machine_id]. Report this code when contacting NanoTrasen IT Support
" if(transaction_locked) - dat += "Reset[transaction_paid ? "" : " (authentication required)"]

" + dat += "Back[transaction_paid ? "" : " (authentication required)"]

" dat += "Transaction purpose: [transaction_purpose]
" dat += "Value: $[transaction_amount]
" @@ -185,10 +185,14 @@ transaction_amount = try_num if("toggle_lock") if(transaction_locked) - var/attempt_code = input("Enter EFTPOS access code", "Reset Transaction") as num - if(attempt_code == access_code) + if (transaction_paid) transaction_locked = 0 transaction_paid = 0 + else + var/attempt_code = input("Enter EFTPOS access code", "Reset Transaction") as num + if(attempt_code == access_code) + transaction_locked = 0 + transaction_paid = 0 else if(linked_account) transaction_locked = 1 else diff --git a/code/modules/economy/cash.dm b/code/modules/economy/cash.dm index 2a709e731a..8067120695 100644 --- a/code/modules/economy/cash.dm +++ b/code/modules/economy/cash.dm @@ -75,7 +75,7 @@ proc/spawn_money(var/sum, spawnloc) /obj/item/weapon/spacecash/ewallet name = "Charge card" - icon_state = "spacecash1000" + icon_state = "efundcard" desc = "A card that holds an amount of money." var/owner_name = "" //So the ATM can set it so the EFTPOS can put a valid name on transactions. diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi index 626af845c1..71242105ae 100644 Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ