diff --git a/code/game/machinery/bank_machine.dm b/code/game/machinery/bank_machine.dm index d1674c67b39..8c60c5f384a 100644 --- a/code/game/machinery/bank_machine.dm +++ b/code/game/machinery/bank_machine.dm @@ -35,7 +35,7 @@ var/datum/bank_account/D = SSeconomy.get_dep_account(ACCOUNT_CAR) if(D) D.adjust_money(value) - to_chat(user, "You deposit [I]. The Cargo Budget is now $[D.account_balance].") + to_chat(user, "You deposit [I]. The Cargo Budget is now [D.account_balance] cr.") qdel(I) return return ..() diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index 31307e63d6b..aabd5f6f7c2 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -204,10 +204,10 @@ for(var/datum/data/crime/c in active2.fields["citation"]) var/owed = c.fine - c.paid dat += {"[c.crimeName] - $[c.fine][c.author] + [c.fine] cr[c.author] [c.time]"} if(owed > 0) - dat += "$[owed] \[Pay\]" + dat += "[owed] cr \[Pay\]" else dat += "All Paid Off" dat += {" diff --git a/code/game/machinery/computer/warrant.dm b/code/game/machinery/computer/warrant.dm index 057d033e3bf..d5e98ec3e6b 100644 --- a/code/game/machinery/computer/warrant.dm +++ b/code/game/machinery/computer/warrant.dm @@ -55,11 +55,11 @@ for(var/datum/data/crime/c in current.fields["citation"]) var/owed = c.fine - c.paid dat += {"[c.crimeName] - $[c.fine] + [c.fine] cr [c.author] [c.time]"} if(owed > 0) - dat += {"$[owed] + dat += {"[owed] cr \[Pay\]"} else dat += "All Paid Off" diff --git a/code/game/machinery/doppler_array.dm b/code/game/machinery/doppler_array.dm index 3178934434f..9e3c5cf2e50 100644 --- a/code/game/machinery/doppler_array.dm +++ b/code/game/machinery/doppler_array.dm @@ -150,7 +150,7 @@ if(D) D.adjust_money(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 say("Data already captured. Aborting.") diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm index d1e84a85b44..c84ca6e7aab 100644 --- a/code/game/objects/items/cards_ids.dm +++ b/code/game/objects/items/cards_ids.dm @@ -182,7 +182,7 @@ else to_chat(user, "You insert [I] into [src], adding [cash_money] credits to the linked account.") - to_chat(user, "The linked account now reports a balance of $[registered_account.account_balance].") + to_chat(user, "The linked account now reports a balance of [registered_account.account_balance] cr.") qdel(I) /obj/item/card/id/proc/mass_insert_money(list/money, mob/user) @@ -276,11 +276,11 @@ if(mining_points) . += "There's [mining_points] mining equipment redemption point\s loaded onto this card." 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) var/datum/bank_account/D = SSeconomy.get_dep_account(registered_account.account_job.paycheck_department) 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." . += "Alt-Click the ID to pull money from the linked account in the form of holochips." . += "You can insert credits into the linked account by pressing holochips, cash, or coins against the ID." if(registered_account.account_holder == user.real_name) diff --git a/code/modules/antagonists/traitor/syndicate_contract.dm b/code/modules/antagonists/traitor/syndicate_contract.dm index d0451d781d8..3e2ed4b7a84 100644 --- a/code/modules/antagonists/traitor/syndicate_contract.dm +++ b/code/modules/antagonists/traitor/syndicate_contract.dm @@ -139,7 +139,7 @@ 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.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. /datum/syndicate_contract/proc/handleVictimExperience(var/mob/living/M) diff --git a/code/modules/cargo/bounties/science.dm b/code/modules/cargo/bounties/science.dm index 33f334ac472..dbe64e61e48 100644 --- a/code/modules/cargo/bounties/science.dm +++ b/code/modules/cargo/bounties/science.dm @@ -55,7 +55,7 @@ /datum/bounty/item/science/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 wanted_types = list(/obj/item/mop/advanced) diff --git a/code/modules/economy/account.dm b/code/modules/economy/account.dm index 29955448203..51053c4ce77 100644 --- a/code/modules/economy/account.dm +++ b/code/modules/economy/account.dm @@ -58,7 +58,7 @@ bank_card_talk("ERROR: Payday aborted, departmental funds insufficient.") return FALSE else - bank_card_talk("Payday processed, account now holds $[account_balance].") + bank_card_talk("Payday processed, account now holds [account_balance] cr.") return TRUE bank_card_talk("ERROR: Payday aborted, unable to contact departmental account.") return FALSE @@ -79,13 +79,13 @@ card_holder.playsound_local(get_turf(card_holder), 'sound/machines/twobeep_high.ogg', 50, TRUE) if(card_holder.can_hear()) - to_chat(card_holder, "[icon2html(icon_source, card_holder)] *[message]*") + to_chat(card_holder, "[icon2html(icon_source, card_holder)] [message]") else if(isturf(A.loc)) //If on the ground for(var/mob/M in hearers(1,get_turf(A))) if(M.client && !(M.client.prefs.chat_toggles & CHAT_BANKCARD) && !force) return 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))] [message]", null, 1) break else for(var/mob/M in A.loc) //If inside a container with other mobs (e.g. locker) @@ -93,7 +93,7 @@ return M.playsound_local(get_turf(M), 'sound/machines/twobeep_high.ogg', 50, TRUE) if(M.can_hear()) - to_chat(M, "[icon2html(icon_source, M)] *[message]*") + to_chat(M, "[icon2html(icon_source, M)] [message]") /datum/bank_account/department account_holder = "Guild Credit Agency" diff --git a/code/modules/modular_computers/laptop_vendor.dm b/code/modules/modular_computers/laptop_vendor.dm index 3cced586f7c..871cbd51d2b 100644 --- a/code/modules/modular_computers/laptop_vendor.dm +++ b/code/modules/modular_computers/laptop_vendor.dm @@ -241,15 +241,15 @@ if(!user.temporarilyRemoveItemFromInventory(c)) return credits += c.value - visible_message("[user] inserts [c.value] credits into [src].") + visible_message("[user] inserts [c.value] cr into [src].") qdel(c) return else if(istype(I, /obj/item/holochip)) var/obj/item/holochip/HC = I credits += HC.credits - visible_message("[user] inserts a $[HC.credits] holocredit chip into [src].") + visible_message("[user] inserts a [HC.credits] cr holocredit chip into [src].") qdel(HC) - return + return else if(istype(I, /obj/item/card/id)) if(state != 2) return @@ -257,10 +257,10 @@ var/datum/bank_account/account = ID.registered_account var/target_credits = total_price - credits if(!account.adjust_money(-target_credits)) - say("Insufficient money on card to purchase!") + say("Insufficient credits on card to purchase!") return credits += target_credits - say("$[target_credits] has been desposited from your account.") + say("[target_credits] cr has been desposited from your account.") return return ..() diff --git a/code/modules/ruins/spaceruin_code/listeningstation.dm b/code/modules/ruins/spaceruin_code/listeningstation.dm index 8efeaaabff9..e48a1c45d50 100644 --- a/code/modules/ruins/spaceruin_code/listeningstation.dm +++ b/code/modules/ruins/spaceruin_code/listeningstation.dm @@ -32,7 +32,7 @@ /obj/item/paper/fluff/ruins/listeningstation/receipt name = "receipt" - info = "1 x Stechkin pistol - $600
1 x silencer - $200
shipping charge - $4360
total - $5160" + info = "1 x Stechkin pistol - 600 cr
1 x silencer - 200 cr
shipping charge - 4360 cr
total - 5160 cr" /obj/item/paper/fluff/ruins/listeningstation/odd_report name = "odd report" diff --git a/code/modules/shuttle/special.dm b/code/modules/shuttle/special.dm index d0ef7fd2c50..fe5d6d31678 100644 --- a/code/modules/shuttle/special.dm +++ b/code/modules/shuttle/special.dm @@ -346,7 +346,7 @@ for(var/obj/I in counted_money) qdel(I) if(!check_times[AM] || check_times[AM] < world.time) //Let's not spam the message - to_chat(AM, "[payees[AM]] credits received. You need [threshold-payees[AM]] more.") + to_chat(AM, "[payees[AM]] cr received. You need [threshold-payees[AM]] cr more.") check_times[AM] = world.time + LUXURY_MESSAGE_COOLDOWN alarm_beep() return ..() diff --git a/code/modules/vending/_vending.dm b/code/modules/vending/_vending.dm index cddaf81c04a..8195fd412dd 100644 --- a/code/modules/vending/_vending.dm +++ b/code/modules/vending/_vending.dm @@ -1087,7 +1087,7 @@ GLOBAL_LIST_EMPTY(vending_products) /obj/item/price_tagger/attack_self(mob/user) price = max(1, round(input(user,"set price","price") as num|null, 1)) - to_chat(user, " The [src] will now give things an $[price] tag.") + to_chat(user, " The [src] will now give things a [price] cr tag.") /obj/item/price_tagger/afterattack(atom/target, mob/user, proximity) . = ..() @@ -1096,4 +1096,4 @@ GLOBAL_LIST_EMPTY(vending_products) if(isitem(target)) var/obj/item/I = target I.custom_price = price - to_chat(user, "You set the price of [I] to $[price].") + to_chat(user, "You set the price of [I] to [price] cr.") diff --git a/tgui-next/packages/tgui/interfaces/BankMachine.js b/tgui-next/packages/tgui/interfaces/BankMachine.js index 1021f4f6a1a..a3d52097ec0 100644 --- a/tgui-next/packages/tgui/interfaces/BankMachine.js +++ b/tgui-next/packages/tgui/interfaces/BankMachine.js @@ -21,7 +21,7 @@ export const BankMachine = props => { selected={siphoning} onClick={() => act(siphoning ? 'halt' : 'siphon')} /> )}> - {'$' + current_balance} + {current_balance + ' cr'} diff --git a/tgui-next/packages/tgui/interfaces/ComputerFabricator.js b/tgui-next/packages/tgui/interfaces/ComputerFabricator.js index 66b531ede86..87366f6f732 100644 --- a/tgui-next/packages/tgui/interfaces/ComputerFabricator.js +++ b/tgui-next/packages/tgui/interfaces/ComputerFabricator.js @@ -78,10 +78,10 @@ const CFScreen = props => { minHeight={47} buttons={( - ${data.totalprice} + {data.totalprice} cr )}> - +
{ {' '} - ${data.totalprice} + {data.totalprice} cr { textAlign="center" fontSize="18px" color={data.credits >= data.totalprice ? "good" : "bad"}> - ${data.credits} + {data.credits} cr