diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index a35ad32987..a4f9a9fb3e 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -210,7 +210,7 @@ return else if (istype(W, /obj/item/weapon/card/emag)) src.emagged = 1 - user << "You short out the product lock on [src]" + user << "You short out the product lock on \the [src]" return else if(istype(W, /obj/item/weapon/screwdriver)) src.panel_open = !src.panel_open @@ -230,7 +230,7 @@ W.loc = src coin = W categories |= CAT_COIN - user << "\blue You insert the [W] into the [src]" + user << "\blue You insert \the [W] into \the [src]" nanomanager.update_uis(src) return else if(istype(W, /obj/item/weapon/wrench)) @@ -240,9 +240,9 @@ switch (anchored) if (0) anchored = 1 - user.visible_message("[user] tightens the bolts securing \the [src] to the floor.", "You tighten the bolts securing \the [src] to the floor.") + user.visible_message("\The [user] tightens the bolts securing \the [src] to the floor.", "You tighten the bolts securing \the [src] to the floor.") if (1) - user.visible_message("[user] unfastens the bolts securing \the [src] to the floor.", "You unfasten the bolts securing \the [src] to the floor.") + user.visible_message("\The [user] unfastens the bolts securing \the [src] to the floor.", "You unfasten the bolts securing \the [src] to the floor.") anchored = 0 return @@ -272,7 +272,7 @@ if(istype(cashmoney, /obj/item/weapon/spacecash/bundle)) // Bundles can just have money subtracted, and will work - visible_message("[usr] inserts some cash into [src].") + visible_message("\The [usr] inserts some cash into \the [src].") var/obj/item/weapon/spacecash/bundle/cashmoney_bundle = cashmoney cashmoney_bundle.worth -= currently_vending.price @@ -287,7 +287,7 @@ // This is really dirty, but there's no superclass for all bills, so we // just assume that all spacecash that's not something else is a bill - visible_message("[usr] inserts a bill into [src].") + visible_message("\The [usr] inserts a bill into \the [src].") var/left = cashmoney.worth - currently_vending.price usr.drop_from_inventory(cashmoney) del(cashmoney) @@ -306,7 +306,7 @@ * successful, 0 if failed. */ /obj/machinery/vending/proc/pay_with_ewallet(var/obj/item/weapon/spacecash/ewallet/wallet) - visible_message("[usr] swipes [wallet] through [src].") + visible_message("\The [usr] swipes \the [wallet] through \the [src].") if(currently_vending.price > wallet.worth) src.status_message = "Insufficient funds on chargecard." src.status_error = 1 @@ -323,10 +323,10 @@ * successful, 0 if failed */ /obj/machinery/vending/proc/pay_with_card(var/obj/item/weapon/card/id/I, var/obj/item/ID_container) - if(ID_container) - visible_message("[usr] swipes [ID_container] through [src].") + if(I==ID_container || ID_container == null) + visible_message("\The [usr] swipes \the [I] through \the [src].") else - visible_message("[usr] swipes [I] through [src].") + visible_message("\The [usr] swipes \the [ID_container] through \the [src].") var/datum/money_account/customer_account = get_account(I.associated_account_number) if (!customer_account) src.status_message = "Error: Unable to access account. Please contact technical support if problem persists." @@ -538,7 +538,7 @@ return if(coin.string_attached) if(prob(50)) - user << "\blue You successfully pull the coin out before the [src] could swallow it." + user << "\blue You successfully pull the coin out before \the [src] could swallow it." else user << "\blue You weren't able to pull the coin out fast enough, the machine ate it, string and all." del(coin) @@ -567,7 +567,7 @@ /obj/machinery/vending/proc/stock(var/datum/data/vending_product/R, var/mob/user) if(src.panel_open) - user << "\blue You stock the [src] with \a [R.product_name]" + user << "\blue You stock \the [src] with \a [R.product_name]" R.amount++ nanomanager.update_uis(src) @@ -601,7 +601,7 @@ return for(var/mob/O in hearers(src, null)) - O.show_message("[src] beeps, \"[message]\"",2) + O.show_message("\The [src] beeps, \"[message]\"",2) return /obj/machinery/vending/power_change() diff --git a/code/modules/economy/EFTPOS.dm b/code/modules/economy/EFTPOS.dm index c9f1aa1533..8758613f8d 100644 --- a/code/modules/economy/EFTPOS.dm +++ b/code/modules/economy/EFTPOS.dm @@ -1,5 +1,5 @@ /obj/item/device/eftpos - name = "EFTPOS scanner" + name = "\improper EFTPOS scanner" desc = "Swipe your ID card to make purchases electronically." icon = 'icons/obj/device.dmi' icon_state = "eftpos" @@ -110,11 +110,13 @@ else user << browse(null,"window=eftpos") -/obj/item/device/eftpos/attackby(O as obj, user as mob) - if(istype(O, /obj/item/weapon/card)) +/obj/item/device/eftpos/attackby(obj/item/O as obj, user as mob) + + var/obj/item/weapon/card/id/I = O.GetID() + + if(I) if(linked_account) - var/obj/item/weapon/card/I = O - scan_card(I) + scan_card(I, O) else usr << "\icon[src]Unable to connect to linked account." else if (istype(O, /obj/item/weapon/spacecash/ewallet)) @@ -124,7 +126,7 @@ if(transaction_locked && !transaction_paid) if(transaction_amount <= E.worth) playsound(src, 'sound/machines/chime.ogg', 50, 1) - src.visible_message("\icon[src] The [src] chimes.") + src.visible_message("\icon[src] \The [src] chimes.") transaction_paid = 1 //transfer the money @@ -141,7 +143,7 @@ T.time = worldtime2text() linked_account.transaction_log.Add(T) else - usr << "\icon[src]The charge card doesn't have that much money!" + usr << "\icon[src]\The [O] doesn't have that much money!" else usr << "\icon[src]Connected account has been suspended." else @@ -225,10 +227,13 @@ src.attack_self(usr) -/obj/item/device/eftpos/proc/scan_card(var/obj/item/weapon/card/I) +/obj/item/device/eftpos/proc/scan_card(var/obj/item/weapon/card/I, var/obj/item/ID_container) if (istype(I, /obj/item/weapon/card/id)) var/obj/item/weapon/card/id/C = I - visible_message("[usr] swipes a card through [src].") + if(I==ID_container || ID_container == null) + usr.visible_message("\The [usr] swipes a card through \the [src].") + else + usr.visible_message("\The [usr] swipes \the [ID_container] through \the [src].") if(transaction_locked && !transaction_paid) if(linked_account) if(!linked_account.suspended) @@ -242,7 +247,7 @@ if(!D.suspended) if(transaction_amount <= D.money) playsound(src, 'sound/machines/chime.ogg', 50, 1) - src.visible_message("\icon[src] The [src] chimes.") + src.visible_message("\icon[src] \The [src] chimes.") transaction_paid = 1 //transfer the money @@ -283,13 +288,13 @@ else if (istype(I, /obj/item/weapon/card/emag)) if(transaction_locked) if(transaction_paid) - usr << "\icon[src]You stealthily swipe [I] through [src]." + usr << "\icon[src]You stealthily swipe \the [I] through \the [src]." transaction_locked = 0 transaction_paid = 0 else - visible_message("[usr] swipes a card through [src].") + usr.visible_message("\The [usr] swipes a card through \the [src].") playsound(src, 'sound/machines/chime.ogg', 50, 1) - src.visible_message("\icon[src] The [src] chimes.") + src.visible_message("\icon[src] \The [src] chimes.") transaction_paid = 1 else ..() diff --git a/html/changelog.html b/html/changelog.html index ddd819f82f..22483bd709 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -60,7 +60,7 @@ should be listed in the changelog upon commit though. Thanks. -->

7 April 2015

RavingManiac updated: