Changes $1 to 1 cr (#48414)

* $ to cr

* Payday messages use a proper span instead of asterisks
This commit is contained in:
cacogen
2019-12-29 03:29:36 +13:00
committed by Aleksej Komarov
parent 012751a219
commit 6b63bf7093
14 changed files with 29 additions and 29 deletions

View File

@@ -35,7 +35,7 @@
var/datum/bank_account/D = SSeconomy.get_dep_account(ACCOUNT_CAR) var/datum/bank_account/D = SSeconomy.get_dep_account(ACCOUNT_CAR)
if(D) if(D)
D.adjust_money(value) D.adjust_money(value)
to_chat(user, "<span class='notice'>You deposit [I]. The Cargo Budget is now $[D.account_balance].</span>") to_chat(user, "<span class='notice'>You deposit [I]. The Cargo Budget is now [D.account_balance] cr.</span>")
qdel(I) qdel(I)
return return
return ..() return ..()

View File

@@ -204,10 +204,10 @@
for(var/datum/data/crime/c in active2.fields["citation"]) for(var/datum/data/crime/c in active2.fields["citation"])
var/owed = c.fine - c.paid var/owed = c.fine - c.paid
dat += {"<tr><td>[c.crimeName]</td> dat += {"<tr><td>[c.crimeName]</td>
<td>$[c.fine]</td><td>[c.author]</td> <td>[c.fine] cr</td><td>[c.author]</td>
<td>[c.time]</td>"} <td>[c.time]</td>"}
if(owed > 0) if(owed > 0)
dat += "<td>$[owed] <A href='?src=[REF(src)];choice=Pay;field=citation_pay;cdataid=[c.dataId]'>\[Pay\]</A></td></td>" dat += "<td>[owed] cr <A href='?src=[REF(src)];choice=Pay;field=citation_pay;cdataid=[c.dataId]'>\[Pay\]</A></td></td>"
else else
dat += "<td>All Paid Off</td>" dat += "<td>All Paid Off</td>"
dat += {"<td> dat += {"<td>

View File

@@ -55,11 +55,11 @@
for(var/datum/data/crime/c in current.fields["citation"]) for(var/datum/data/crime/c in current.fields["citation"])
var/owed = c.fine - c.paid var/owed = c.fine - c.paid
dat += {"<tr><td>[c.crimeName]</td> dat += {"<tr><td>[c.crimeName]</td>
<td>$[c.fine]</td> <td>[c.fine] cr</td>
<td>[c.author]</td> <td>[c.author]</td>
<td>[c.time]</td>"} <td>[c.time]</td>"}
if(owed > 0) if(owed > 0)
dat += {"<td>$[owed]</td> dat += {"<td>[owed] cr</td>
<td><A href='?src=[REF(src)];choice=Pay;field=citation_pay;cdataid=[c.dataId]'>\[Pay\]</A></td>"} <td><A href='?src=[REF(src)];choice=Pay;field=citation_pay;cdataid=[c.dataId]'>\[Pay\]</A></td>"}
else else
dat += "<td colspan='2'>All Paid Off</td>" dat += "<td colspan='2'>All Paid Off</td>"

View File

@@ -150,7 +150,7 @@
if(D) if(D)
D.adjust_money(point_gain) D.adjust_money(point_gain)
linked_techweb.add_point_type(TECHWEB_POINT_TYPE_DEFAULT, point_gain) linked_techweb.add_point_type(TECHWEB_POINT_TYPE_DEFAULT, point_gain)
say("Explosion details and mixture analyzed and sold to the highest bidder for $[point_gain], with a reward of [point_gain] points.") say("Explosion details and mixture analyzed and sold to the highest bidder for [point_gain] cr, with a reward of [point_gain] points.")
else //you've made smaller bombs else //you've made smaller bombs
say("Data already captured. Aborting.") say("Data already captured. Aborting.")

View File

@@ -182,7 +182,7 @@
else else
to_chat(user, "<span class='notice'>You insert [I] into [src], adding [cash_money] credits to the linked account.</span>") to_chat(user, "<span class='notice'>You insert [I] into [src], adding [cash_money] credits to the linked account.</span>")
to_chat(user, "<span class='notice'>The linked account now reports a balance of $[registered_account.account_balance].</span>") to_chat(user, "<span class='notice'>The linked account now reports a balance of [registered_account.account_balance] cr.</span>")
qdel(I) qdel(I)
/obj/item/card/id/proc/mass_insert_money(list/money, mob/user) /obj/item/card/id/proc/mass_insert_money(list/money, mob/user)
@@ -276,11 +276,11 @@
if(mining_points) if(mining_points)
. += "There's [mining_points] mining equipment redemption point\s loaded onto this card." . += "There's [mining_points] mining equipment redemption point\s loaded onto this card."
if(registered_account) if(registered_account)
. += "The account linked to the ID belongs to '[registered_account.account_holder]' and reports a balance of $[registered_account.account_balance]." . += "The account linked to the ID belongs to '[registered_account.account_holder]' and reports a balance of [registered_account.account_balance] cr."
if(registered_account.account_job) if(registered_account.account_job)
var/datum/bank_account/D = SSeconomy.get_dep_account(registered_account.account_job.paycheck_department) var/datum/bank_account/D = SSeconomy.get_dep_account(registered_account.account_job.paycheck_department)
if(D) if(D)
. += "The [D.account_holder] reports a balance of $[D.account_balance]." . += "The [D.account_holder] reports a balance of [D.account_balance] cr."
. += "<span class='info'>Alt-Click the ID to pull money from the linked account in the form of holochips.</span>" . += "<span class='info'>Alt-Click the ID to pull money from the linked account in the form of holochips.</span>"
. += "<span class='info'>You can insert credits into the linked account by pressing holochips, cash, or coins against the ID.</span>" . += "<span class='info'>You can insert credits into the linked account by pressing holochips, cash, or coins against the ID.</span>"
if(registered_account.account_holder == user.real_name) if(registered_account.account_holder == user.real_name)

View File

@@ -139,7 +139,7 @@
C.registered_account.adjust_money(ransom * 0.35) C.registered_account.adjust_money(ransom * 0.35)
C.registered_account.bank_card_talk("We've processed the ransom, agent. Here's your cut - your balance is now \ C.registered_account.bank_card_talk("We've processed the ransom, agent. Here's your cut - your balance is now \
$[C.registered_account.account_balance].", TRUE) [C.registered_account.account_balance] cr.", TRUE)
// They're off to holding - handle the return timer and give some text about what's going on. // They're off to holding - handle the return timer and give some text about what's going on.
/datum/syndicate_contract/proc/handleVictimExperience(var/mob/living/M) /datum/syndicate_contract/proc/handleVictimExperience(var/mob/living/M)

View File

@@ -55,7 +55,7 @@
/datum/bounty/item/science/advanced_mop /datum/bounty/item/science/advanced_mop
name = "Advanced Mop" name = "Advanced Mop"
description = "Excuse me. I'd like to request $17 for a push broom rebristling. Either that, or an advanced mop." description = "Excuse me. I'd like to request 17 cr for a push broom rebristling. Either that, or an advanced mop."
reward = 10000 reward = 10000
wanted_types = list(/obj/item/mop/advanced) wanted_types = list(/obj/item/mop/advanced)

View File

@@ -58,7 +58,7 @@
bank_card_talk("ERROR: Payday aborted, departmental funds insufficient.") bank_card_talk("ERROR: Payday aborted, departmental funds insufficient.")
return FALSE return FALSE
else else
bank_card_talk("Payday processed, account now holds $[account_balance].") bank_card_talk("Payday processed, account now holds [account_balance] cr.")
return TRUE return TRUE
bank_card_talk("ERROR: Payday aborted, unable to contact departmental account.") bank_card_talk("ERROR: Payday aborted, unable to contact departmental account.")
return FALSE return FALSE
@@ -79,13 +79,13 @@
card_holder.playsound_local(get_turf(card_holder), 'sound/machines/twobeep_high.ogg', 50, TRUE) card_holder.playsound_local(get_turf(card_holder), 'sound/machines/twobeep_high.ogg', 50, TRUE)
if(card_holder.can_hear()) if(card_holder.can_hear())
to_chat(card_holder, "[icon2html(icon_source, card_holder)] *[message]*") to_chat(card_holder, "[icon2html(icon_source, card_holder)] <span class='notice'>[message]</span>")
else if(isturf(A.loc)) //If on the ground else if(isturf(A.loc)) //If on the ground
for(var/mob/M in hearers(1,get_turf(A))) for(var/mob/M in hearers(1,get_turf(A)))
if(M.client && !(M.client.prefs.chat_toggles & CHAT_BANKCARD) && !force) if(M.client && !(M.client.prefs.chat_toggles & CHAT_BANKCARD) && !force)
return return
playsound(A, 'sound/machines/twobeep_high.ogg', 50, TRUE) playsound(A, 'sound/machines/twobeep_high.ogg', 50, TRUE)
A.audible_message("[icon2html(icon_source, hearers(A))] *[message]*", null, 1) A.audible_message("[icon2html(icon_source, hearers(A))] <span class='notice'>[message]</span>", null, 1)
break break
else else
for(var/mob/M in A.loc) //If inside a container with other mobs (e.g. locker) for(var/mob/M in A.loc) //If inside a container with other mobs (e.g. locker)
@@ -93,7 +93,7 @@
return return
M.playsound_local(get_turf(M), 'sound/machines/twobeep_high.ogg', 50, TRUE) M.playsound_local(get_turf(M), 'sound/machines/twobeep_high.ogg', 50, TRUE)
if(M.can_hear()) if(M.can_hear())
to_chat(M, "[icon2html(icon_source, M)] *[message]*") to_chat(M, "[icon2html(icon_source, M)] <span class='notice'>[message]</span>")
/datum/bank_account/department /datum/bank_account/department
account_holder = "Guild Credit Agency" account_holder = "Guild Credit Agency"

View File

@@ -241,15 +241,15 @@
if(!user.temporarilyRemoveItemFromInventory(c)) if(!user.temporarilyRemoveItemFromInventory(c))
return return
credits += c.value credits += c.value
visible_message("<span class='info'><span class='name'>[user]</span> inserts [c.value] credits into [src].</span>") visible_message("<span class='info'><span class='name'>[user]</span> inserts [c.value] cr into [src].</span>")
qdel(c) qdel(c)
return return
else if(istype(I, /obj/item/holochip)) else if(istype(I, /obj/item/holochip))
var/obj/item/holochip/HC = I var/obj/item/holochip/HC = I
credits += HC.credits credits += HC.credits
visible_message("<span class='info'>[user] inserts a $[HC.credits] holocredit chip into [src].</span>") visible_message("<span class='info'>[user] inserts a [HC.credits] cr holocredit chip into [src].</span>")
qdel(HC) qdel(HC)
return return
else if(istype(I, /obj/item/card/id)) else if(istype(I, /obj/item/card/id))
if(state != 2) if(state != 2)
return return
@@ -257,10 +257,10 @@
var/datum/bank_account/account = ID.registered_account var/datum/bank_account/account = ID.registered_account
var/target_credits = total_price - credits var/target_credits = total_price - credits
if(!account.adjust_money(-target_credits)) if(!account.adjust_money(-target_credits))
say("Insufficient money on card to purchase!") say("Insufficient credits on card to purchase!")
return return
credits += target_credits credits += target_credits
say("$[target_credits] has been desposited from your account.") say("[target_credits] cr has been desposited from your account.")
return return
return ..() return ..()

View File

@@ -32,7 +32,7 @@
/obj/item/paper/fluff/ruins/listeningstation/receipt /obj/item/paper/fluff/ruins/listeningstation/receipt
name = "receipt" name = "receipt"
info = "1 x Stechkin pistol - $600<br>1 x silencer - $200<br>shipping charge - $4360<br>total - $5160" info = "1 x Stechkin pistol - 600 cr<br>1 x silencer - 200 cr<br>shipping charge - 4360 cr<br>total - 5160 cr"
/obj/item/paper/fluff/ruins/listeningstation/odd_report /obj/item/paper/fluff/ruins/listeningstation/odd_report
name = "odd report" name = "odd report"

View File

@@ -346,7 +346,7 @@
for(var/obj/I in counted_money) for(var/obj/I in counted_money)
qdel(I) qdel(I)
if(!check_times[AM] || check_times[AM] < world.time) //Let's not spam the message if(!check_times[AM] || check_times[AM] < world.time) //Let's not spam the message
to_chat(AM, "<span class='notice'>[payees[AM]] credits received. You need [threshold-payees[AM]] more.</span>") to_chat(AM, "<span class='notice'>[payees[AM]] cr received. You need [threshold-payees[AM]] cr more.</span>")
check_times[AM] = world.time + LUXURY_MESSAGE_COOLDOWN check_times[AM] = world.time + LUXURY_MESSAGE_COOLDOWN
alarm_beep() alarm_beep()
return ..() return ..()

View File

@@ -1087,7 +1087,7 @@ GLOBAL_LIST_EMPTY(vending_products)
/obj/item/price_tagger/attack_self(mob/user) /obj/item/price_tagger/attack_self(mob/user)
price = max(1, round(input(user,"set price","price") as num|null, 1)) price = max(1, round(input(user,"set price","price") as num|null, 1))
to_chat(user, "<span class='notice'> The [src] will now give things an $[price] tag.</span>") to_chat(user, "<span class='notice'> The [src] will now give things a [price] cr tag.</span>")
/obj/item/price_tagger/afterattack(atom/target, mob/user, proximity) /obj/item/price_tagger/afterattack(atom/target, mob/user, proximity)
. = ..() . = ..()
@@ -1096,4 +1096,4 @@ GLOBAL_LIST_EMPTY(vending_products)
if(isitem(target)) if(isitem(target))
var/obj/item/I = target var/obj/item/I = target
I.custom_price = price I.custom_price = price
to_chat(user, "<span class='notice'>You set the price of [I] to $[price].</span>") to_chat(user, "<span class='notice'>You set the price of [I] to [price] cr.</span>")

View File

@@ -21,7 +21,7 @@ export const BankMachine = props => {
selected={siphoning} selected={siphoning}
onClick={() => act(siphoning ? 'halt' : 'siphon')} /> onClick={() => act(siphoning ? 'halt' : 'siphon')} />
)}> )}>
{'$' + current_balance} {current_balance + ' cr'}
</LabeledList.Item> </LabeledList.Item>
</LabeledList> </LabeledList>
</Section> </Section>

View File

@@ -78,10 +78,10 @@ const CFScreen = props => {
minHeight={47} minHeight={47}
buttons={( buttons={(
<Box bold color="good"> <Box bold color="good">
${data.totalprice} {data.totalprice} cr
</Box> </Box>
)}> )}>
<Table width="100%"> <Table>
<Table.Row> <Table.Row>
<Table.Cell <Table.Cell
bold bold
@@ -347,7 +347,7 @@ const CFScreen = props => {
</Box> </Box>
{' '} {' '}
<Box inline color="good"> <Box inline color="good">
${data.totalprice} {data.totalprice} cr
</Box> </Box>
</Box> </Box>
<Box <Box
@@ -363,7 +363,7 @@ const CFScreen = props => {
textAlign="center" textAlign="center"
fontSize="18px" fontSize="18px"
color={data.credits >= data.totalprice ? "good" : "bad"}> color={data.credits >= data.totalprice ? "good" : "bad"}>
${data.credits} {data.credits} cr
</Box> </Box>
<Button <Button
fluid fluid