diff --git a/code/__DEFINES/economy.dm b/code/__DEFINES/economy.dm
index c98a5c49b82..a44bc26079e 100644
--- a/code/__DEFINES/economy.dm
+++ b/code/__DEFINES/economy.dm
@@ -82,11 +82,17 @@
#define MARKET_EVENT_PROBABILITY 8 //Probability of a market event firing, in percent. Fires once per material, every stock market tick.
+// Fair warning that these defines at present are not used in all tgui, static descriptions, or any varible names or comments
/// The symbol for the default type of money used in the code.
#define MONEY_SYMBOL "cr"
/// The name for the default type of money used in the code.
#define MONEY_NAME "credits"
#define MONEY_NAME_SINGULAR "credit"
+#define MONEY_NAME_CAPITALIZED "Credits"
+// Due to the ways macros work, I cant just directly use credit\s.
+// You will need to verify there is no loose use cases of credit\s.
+// As of present there is none left floating around.
+#define MONEY_NAME_AUTOPURAL(amount) "credit[##amount == 1 ? "" : "s"]"
#define MONEY_MINING_SYMBOL "mp"
#define MONEY_BITRUNNING_SYMBOL "np"
diff --git a/code/__HELPERS/roundend.dm b/code/__HELPERS/roundend.dm
index dc940f4c0a8..8e21e78b1b2 100644
--- a/code/__HELPERS/roundend.dm
+++ b/code/__HELPERS/roundend.dm
@@ -526,9 +526,9 @@ GLOBAL_LIST_INIT(achievements_unlocked, list())
for(var/venue_path in SSrestaurant.all_venues)
var/datum/venue/venue = SSrestaurant.all_venues[venue_path]
tourist_income += venue.total_income
- parts += "The [venue] served [venue.customers_served] customer\s and made [venue.total_income] credits.
"
- parts += "In total, they earned [tourist_income] credits[tourist_income ? "!" : "..."]
"
- log_econ("Roundend service income: [tourist_income] credits.")
+ parts += "The [venue] served [venue.customers_served] customer\s and made [venue.total_income] [MONEY_NAME].
"
+ parts += "In total, they earned [tourist_income] [MONEY_NAME][tourist_income ? "!" : "..."]
"
+ log_econ("Roundend service income: [tourist_income] [MONEY_NAME].")
// Award service achievements based on tourist income
switch(tourist_income)
@@ -541,7 +541,7 @@ GLOBAL_LIST_INIT(achievements_unlocked, list())
switch(tourist_income)
if(0)
- parts += "[span_redtext("Service did not earn any credits...")]
"
+ parts += "[span_redtext("Service did not earn any [MONEY_NAME]...")]
"
if(1 to 2000)
parts += "[span_redtext("Centcom is displeased. Come on service, surely you can do better than that.")]
"
if(2001 to 4999)
@@ -550,12 +550,12 @@ GLOBAL_LIST_INIT(achievements_unlocked, list())
parts += "Centcom is incredibly impressed with service today! What a team!
"
parts += "General Statistics:
"
- parts += "There were [station_vault] credits collected by crew this shift.
"
+ parts += "There were [station_vault] [MONEY_NAME] collected by crew this shift.
"
if(total_players > 0)
- parts += "An average of [station_vault/total_players] credits were collected.
"
- log_econ("Roundend credit total: [station_vault] credits. Average Credits: [station_vault/total_players]")
+ parts += "An average of [station_vault/total_players] [MONEY_NAME] were collected.
"
+ log_econ("Roundend [MONEY_NAME_SINGULAR] total: [station_vault] [MONEY_NAME]. Average [MONEY_NAME_CAPITALIZED]: [station_vault/total_players]")
if(mr_moneybags)
- parts += "The most affluent crew member at shift end was [mr_moneybags.account_holder] with [mr_moneybags.account_balance] cr!"
+ parts += "The most affluent crew member at shift end was [mr_moneybags.account_holder] with [mr_moneybags.account_balance] [MONEY_SYMBOL]!"
else
parts += "Somehow, nobody made any money this shift! This'll result in some budget cuts..."
return parts.Join()
diff --git a/code/controllers/subsystem/economy.dm b/code/controllers/subsystem/economy.dm
index 8b251ad261c..0766834fa86 100644
--- a/code/controllers/subsystem/economy.dm
+++ b/code/controllers/subsystem/economy.dm
@@ -173,7 +173,7 @@ SUBSYSTEM_DEF(economy)
fluff_string = ", but company countermeasures protect YOU from being affected!"
else
fluff_string = ", and company countermeasures are failing to protect YOU from being affected. We're all doomed!"
- earning_report = "Sector Economic Report
Sector vendor prices is currently at [SSeconomy.inflation_value()*100]%[fluff_string]
The station spending power is currently [station_total] Credits, and the crew's targeted allowance is at [station_target] Credits.
[SSstock_market.news_string]"
+ earning_report = "Sector Economic Report
Sector vendor prices is currently at [SSeconomy.inflation_value()*100]%[fluff_string]
The station spending power is currently [station_total] [MONEY_NAME_CAPITALIZED], and the crew's targeted allowance is at [station_target] [MONEY_NAME_CAPITALIZED].
[SSstock_market.news_string]"
var/update_alerts = FALSE
if(HAS_TRAIT(SSstation, STATION_TRAIT_ECONOMY_ALERTS) && (living_player_count() > 1))
var/datum/bank_account/moneybags
@@ -185,7 +185,7 @@ SUBSYSTEM_DEF(economy)
if(!moneybags || moneybags.account_balance < current_acc.account_balance)
moneybags = current_acc
if (moneybags)
- earning_report += "Our GMM Spotlight would like to alert you that [moneybags.account_holder] is your station's most affulent crewmate! They've hit it big with [moneybags.account_balance] credits saved. "
+ earning_report += "Our GMM Spotlight would like to alert you that [moneybags.account_holder] is your station's most affulent crewmate! They've hit it big with [moneybags.account_balance] [MONEY_NAME] saved. "
update_alerts = TRUE
inflict_moneybags(moneybags)
earning_report += "That's all from the Nanotrasen Economist Division."
diff --git a/code/datums/components/payment.dm b/code/datums/components/payment.dm
index 97cb86e08fb..4f682de0ab3 100644
--- a/code/datums/components/payment.dm
+++ b/code/datums/components/payment.dm
@@ -110,7 +110,7 @@
if(physical_cash_total > 0)
var/obj/item/holochip/holochange = new /obj/item/holochip(user.loc, physical_cash_total) //Change is made in holocredits exclusively.
- holochange.name = "[holochange.credits] credit holochip"
+ holochange.name = "[holochange.credits] [MONEY_NAME_SINGULAR] holochip"
if(ishuman(user))
var/mob/living/carbon/human/paying_customer = user
var/successfully_put_in_hands
@@ -120,8 +120,8 @@
user.pulling = holochange
else
user.pulling = holochange
- log_econ("[total_cost] credits were spent on [parent] by [user].")
- to_chat(user, span_notice("Purchase completed with held credits."))
+ log_econ("[total_cost] [MONEY_NAME] were spent on [parent] by [user].")
+ to_chat(user, span_notice("Purchase completed with held [MONEY_NAME]."))
playsound(user, 'sound/effects/cashregister.ogg', 20, TRUE)
return TRUE
@@ -162,11 +162,11 @@
to_chat(user, span_warning("ID Card lacks funds. Aborting."))
if(PAYMENT_VENDING)
to_chat(user, span_warning("You do not possess the funds to purchase that."))
- atom_parent.balloon_alert(user, "needs [total_cost] credit\s!")
+ atom_parent.balloon_alert(user, "needs [total_cost] [MONEY_NAME_AUTOPURAL(total_cost)]!")
return FALSE
target_acc.transfer_money(idcard.registered_account, total_cost, "Nanotrasen: Usage of Corporate Machinery")
- log_econ("[total_cost] credits were spent on [parent] by [user] via [idcard.registered_account.account_holder]'s card.")
- idcard.registered_account.bank_card_talk("[total_cost] credits deducted from your account.")
+ log_econ("[total_cost] [MONEY_NAME] were spent on [parent] by [user] via [idcard.registered_account.account_holder]'s card.")
+ idcard.registered_account.bank_card_talk("[total_cost] [MONEY_NAME] deducted from your account.")
playsound(src, 'sound/effects/cashregister.ogg', 20, TRUE)
SSeconomy.add_audit_entry(idcard.registered_account, total_cost, parent)
return TRUE
diff --git a/code/datums/components/plundering_attacks.dm b/code/datums/components/plundering_attacks.dm
index f55fa42b071..93aa4292549 100644
--- a/code/datums/components/plundering_attacks.dm
+++ b/code/datums/components/plundering_attacks.dm
@@ -44,7 +44,7 @@
amount_to_steal = account_to_rob.account_balance
plunder_stored += amount_to_steal
account_to_rob.adjust_money(-amount_to_steal)
- account_to_rob.bank_card_talk("Transaction confirmed! Transferred [amount_to_steal] credits to \!")
+ account_to_rob.bank_card_talk("Transaction confirmed! Transferred [amount_to_steal] [MONEY_NAME] to \!")
/datum/component/plundering_attacks/proc/drop_plunder()
SIGNAL_HANDLER
diff --git a/code/datums/components/pricetag.dm b/code/datums/components/pricetag.dm
index dfa1471ec91..d8636952921 100644
--- a/code/datums/components/pricetag.dm
+++ b/code/datums/components/pricetag.dm
@@ -91,7 +91,7 @@
overall_item_price = max(0, overall_item_price - payee_cut)
payee.adjust_money(payee_cut, "Pricetag: [capitalize(format_text(source.name))] Sale")
- payee.bank_card_talk("Sale of [source] recorded. [payee_cut] credits added to account.")
+ payee.bank_card_talk("Sale of [source] recorded. [payee_cut] [MONEY_NAME] added to account.")
// Update the report with the modified final price
report.total_value[export] += overall_item_price
diff --git a/code/datums/quirks/negative_quirks/indebted.dm b/code/datums/quirks/negative_quirks/indebted.dm
index eac2cdf5192..9d643654d31 100644
--- a/code/datums/quirks/negative_quirks/indebted.dm
+++ b/code/datums/quirks/negative_quirks/indebted.dm
@@ -15,7 +15,7 @@
var/debt = PAYCHECK_CREW * rand(275, 325)
account.account_debt += debt
RegisterSignal(account, COMSIG_BANK_ACCOUNT_DEBT_PAID, PROC_REF(on_debt_paid))
- to_chat(client_source.mob, span_warning("You remember, you've a hefty, [debt] credits debt to pay..."))
+ to_chat(client_source.mob, span_warning("You remember, you've a hefty, [debt] [MONEY_NAME_SINGULAR] debt to pay..."))
///Once the debt is extinguished, award an achievement and a pin for actually taking care of it.
/datum/quirk/indebted/proc/on_debt_paid(datum/bank_account/source)
diff --git a/code/game/machinery/bank_machine.dm b/code/game/machinery/bank_machine.dm
index c6ff98ec371..2c6f88fde4e 100644
--- a/code/game/machinery/bank_machine.dm
+++ b/code/game/machinery/bank_machine.dm
@@ -60,7 +60,7 @@
if(value)
if(synced_bank_account)
synced_bank_account.adjust_money(value)
- say("Credits deposited! The [synced_bank_account.account_holder] is now [synced_bank_account.account_balance] cr.")
+ say("[MONEY_NAME_CAPITALIZED] deposited! The [synced_bank_account.account_holder] is now [synced_bank_account.account_balance] [MONEY_SYMBOL].")
qdel(weapon)
return
return ..()
@@ -112,13 +112,13 @@
switch(action)
if("siphon")
if(is_station_level(src.z) || is_centcom_level(src.z))
- say("Siphon of station credits has begun!")
+ say("Siphon of station [MONEY_NAME] has begun!")
start_siphon(ui.user)
else
say("Error: Console not in reach of station, withdrawal cannot begin.")
. = TRUE
if("halt")
- say("Station credit withdrawal halted.")
+ say("Station [MONEY_NAME_SINGULAR] withdrawal halted.")
end_siphon()
. = TRUE
diff --git a/code/game/machinery/civilian_bounties.dm b/code/game/machinery/civilian_bounties.dm
index b917bed6c7d..9f2254a28ce 100644
--- a/code/game/machinery/civilian_bounties.dm
+++ b/code/game/machinery/civilian_bounties.dm
@@ -336,9 +336,9 @@
/obj/item/bounty_cube/examine()
. = ..()
if(speed_bonus)
- . += span_notice("[time2text(next_nag_time - world.time,"mm:ss", NO_TIMEZONE)] remains until [bounty_value * speed_bonus] credit speedy delivery bonus lost.")
+ . += span_notice("[time2text(next_nag_time - world.time,"mm:ss", NO_TIMEZONE)] remains until [bounty_value * speed_bonus] [MONEY_NAME_SINGULAR] speedy delivery bonus lost.")
if(handler_tip && !bounty_handler_account)
- . += span_notice("Scan this in the cargo shuttle with an export scanner to register your bank account for the [bounty_value * handler_tip] credit handling tip.")
+ . += span_notice("Scan this in the cargo shuttle with an export scanner to register your bank account for the [bounty_value * handler_tip] [MONEY_NAME_SINGULAR] handling tip.")
/obj/item/bounty_cube/process(seconds_per_tick)
//if our nag cooldown has finished and we aren't on Centcom or in transit, then nag
@@ -372,7 +372,7 @@
bounty_holder = holder_id.registered_name
bounty_holder_job = holder_id.assignment
bounty_holder_account = holder_id.registered_account
- name = "\improper [bounty_value] cr [name]"
+ name = "\improper [bounty_value] [MONEY_SYMBOL] [name]"
desc += " The sales tag indicates it was [bounty_holder] ([bounty_holder_job])'s reward for completing the [bounty_name] bounty."
AddComponent(/datum/component/pricetag, holder_id.registered_account, holder_cut, FALSE)
AddComponent(/datum/component/gps, "[src]")
diff --git a/code/game/machinery/computer/accounting.dm b/code/game/machinery/computer/accounting.dm
index 75a890d382a..878c450e819 100644
--- a/code/game/machinery/computer/accounting.dm
+++ b/code/game/machinery/computer/accounting.dm
@@ -71,7 +71,7 @@
bank_account.payday_modifier = clamp(round(text2num(params["pay_mod"]), 0.05), MIN_PAY_MOD, MAX_PAY_MOD)
var/new_check_total = bank_account.payday_modifier * bank_account.account_job.paycheck
var/raise_or_cut = new_check_total > old_modifier * bank_account.account_job.paycheck ? "raised" : "cut"
- bank_account.bank_card_talk("Paycheck [raise_or_cut] to [new_check_total]cr.")
+ bank_account.bank_card_talk("Paycheck [raise_or_cut] to [new_check_total][MONEY_SYMBOL].")
SSeconomy.add_audit_entry(bank_account, new_check_total, "Paycheck [raise_or_cut]")
return TRUE
diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm
index ab687c53805..d3e9f2899bb 100644
--- a/code/game/machinery/computer/communications.dm
+++ b/code/game/machinery/computer/communications.dm
@@ -282,7 +282,7 @@
bank_account.adjust_money(-shuttle.credit_cost)
var/purchaser_name = (obj_flags & EMAGGED) ? scramble_message_replace_chars("AUTHENTICATION FAILURE: CVE-2018-17107", 60) : user.real_name
- minor_announce("[purchaser_name] has purchased [shuttle.name] for [shuttle.credit_cost] credits.[shuttle.extra_desc ? " [shuttle.extra_desc]" : ""]" , "Shuttle Purchase")
+ minor_announce("[purchaser_name] has purchased [shuttle.name] for [shuttle.credit_cost] [MONEY_NAME].[shuttle.extra_desc ? " [shuttle.extra_desc]" : ""]" , "Shuttle Purchase")
message_admins("[ADMIN_LOOKUPFLW(user)] purchased [shuttle.name].")
log_shuttle("[key_name(user)] has purchased [shuttle.name].")
diff --git a/code/game/machinery/computer/records/security.dm b/code/game/machinery/computer/records/security.dm
index 2affdf0dfbf..0bb27a539fe 100644
--- a/code/game/machinery/computer/records/security.dm
+++ b/code/game/machinery/computer/records/security.dm
@@ -211,7 +211,7 @@
var/max = CONFIG_GET(number/maxfine)
if(params["fine"] > max)
- to_chat(usr, span_warning("The maximum fine is [max] credits."))
+ to_chat(usr, span_warning("The maximum fine is [max] [MONEY_NAME]."))
playsound(src, 'sound/machines/terminal/terminal_error.ogg', 75, TRUE)
return FALSE
@@ -233,7 +233,7 @@
var/datum/crime/citation/new_citation = new(name = input_name, details = input_details, author = usr, fine = params["fine"])
target.citations += new_citation
- new_citation.alert_owner(user, src, target.name, "You have been issued a [params["fine"]]cr citation for [input_name]. Fines are payable at Security.")
+ new_citation.alert_owner(user, src, target.name, "You have been issued a [params["fine"]][MONEY_SYMBOL] citation for [input_name]. Fines are payable at Security.")
investigate_log("New Citation: [input_name] Fine: [params["fine"]] | Added to [target.name] by [key_name(user)]", INVESTIGATE_RECORDS)
SSblackbox.ReportCitation(REF(new_citation), user.ckey, user.real_name, target.name, input_name, input_details, params["fine"])
diff --git a/code/game/machinery/computer/warrant.dm b/code/game/machinery/computer/warrant.dm
index 7e66c748917..cc393e14a21 100644
--- a/code/game/machinery/computer/warrant.dm
+++ b/code/game/machinery/computer/warrant.dm
@@ -110,8 +110,8 @@
playsound(src, 'sound/machines/terminal/terminal_error.ogg', 100, TRUE)
return FALSE
- account.bank_card_talk("You have paid [amount]cr towards [target.name]'s fine of [warrant.fine]cr.")
- log_econ("[amount]cr was transferred from [user]'s transaction to [target.name]'s [warrant.fine]cr fine")
+ account.bank_card_talk("You have paid [amount][MONEY_SYMBOL] towards [target.name]'s fine of [warrant.fine][MONEY_SYMBOL].")
+ log_econ("[amount][MONEY_SYMBOL] was transferred from [user]'s transaction to [target.name]'s [warrant.fine][MONEY_SYMBOL] fine")
SSblackbox.record_feedback("amount", "credits_transferred", amount)
warrant.pay_fine(amount)
@@ -124,7 +124,7 @@
"A friendly face",
"A helpful stranger",
)
- warrant.alert_owner(user, src, target.name, "[pick(titles)] has paid [amount]cr towards your fine.")
+ warrant.alert_owner(user, src, target.name, "[pick(titles)] has paid [amount][MONEY_SYMBOL] towards your fine.")
var/datum/bank_account/sec_account = SSeconomy.get_dep_account(ACCOUNT_SEC)
sec_account.adjust_money(amount)
@@ -166,7 +166,7 @@
bounty_text += "Issued to:
[usr]
"
bounty_text += "Issued on:
[warrant.time]
"
bounty_text += "Comments:
[!target.security_note ? "None." : target.security_note]
"
- bounty_text += "FINE: [warrant.fine] credits"
+ bounty_text += "FINE: [warrant.fine] [MONEY_NAME]"
printing = TRUE
balloon_alert(user, "printing")
@@ -174,7 +174,7 @@
var/obj/item/paper/bounty = new(null)
bounty.name = "Bounty for [target.name]"
- bounty.desc = "A [warrant.fine]cr bounty for [target.name]."
+ bounty.desc = "A [warrant.fine][MONEY_SYMBOL] bounty for [target.name]."
bounty.add_raw_text(bounty_text)
bounty.update_icon()
diff --git a/code/game/machinery/newscaster/newscaster_machine.dm b/code/game/machinery/newscaster/newscaster_machine.dm
index 65a247f7f38..08180d53a91 100644
--- a/code/game/machinery/newscaster/newscaster_machine.dm
+++ b/code/game/machinery/newscaster/newscaster_machine.dm
@@ -878,7 +878,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/newscaster, 30)
playsound(src, 'sound/machines/buzz/buzz-sigh.ogg', 30, TRUE)
return TRUE
payment_target.transfer_money(current_user, active_request.value, "Bounty Request")
- say("Paid out [active_request.value] credits.")
+ say("Paid out [active_request.value] [MONEY_NAME].")
GLOB.request_list.Remove(active_request)
qdel(active_request)
diff --git a/code/game/machinery/roulette_machine.dm b/code/game/machinery/roulette_machine.dm
index e31c72a53b0..e9e94686f7f 100644
--- a/code/game/machinery/roulette_machine.dm
+++ b/code/game/machinery/roulette_machine.dm
@@ -263,7 +263,7 @@
var/account_balance = my_card?.registered_account?.account_balance
potential_payout = (account_balance >= potential_payout) ? potential_payout : account_balance
- say("You have won [potential_payout] credits! Congratulations!")
+ say("You have won [potential_payout] [MONEY_NAME]! Congratulations!")
playsound(src, 'sound/machines/synth/synth_yes.ogg', 50)
if(isliving(user) && (user in viewers(src)))
var/mob/living/living_user = user
diff --git a/code/game/machinery/slotmachine.dm b/code/game/machinery/slotmachine.dm
index a5c6bfdc1a8..ded188b82bd 100644
--- a/code/game/machinery/slotmachine.dm
+++ b/code/game/machinery/slotmachine.dm
@@ -122,7 +122,7 @@
var/obj/item/holochip/inserted_chip = inserted
if(!user.temporarilyRemoveItemFromInventory(inserted_chip))
return ITEM_INTERACT_BLOCKING
- balloon_alert(user, "[inserted_chip.credits] credit[inserted_chip.credits == 1 ? "" : "s"] inserted")
+ balloon_alert(user, "[inserted_chip.credits] [MONEY_NAME_AUTOPURAL(inserted_chip.credits)] inserted")
balance += inserted_chip.credits
qdel(inserted_chip)
return ITEM_INTERACT_SUCCESS
@@ -309,7 +309,7 @@
else if(check_jackpot(JACKPOT_SEVENS))
var/prize = money + JACKPOT
- visible_message("[src] says, 'JACKPOT! You win [prize] credits!'")
+ visible_message("[src] says, 'JACKPOT! You win [prize] [MONEY_NAME]!'")
priority_announce("Congratulations to [user ? user.real_name : usrname] for winning the jackpot at the slot machine in [get_area(src)]!")
if(isliving(user) && (user in viewers(src)))
var/mob/living/living_user = user
@@ -327,14 +327,14 @@
sleep(REEL_DEACTIVATE_DELAY)
else if(linelength == 5)
- visible_message("[src] says, 'Big Winner! You win a thousand credits!'")
+ visible_message("[src] says, 'Big Winner! You win a thousand [MONEY_NAME]!'")
give_money(BIG_PRIZE)
if(isliving(user) && (user in viewers(src)))
var/mob/living/living_user = user
living_user.add_mood_event("slots", /datum/mood_event/slots/win/big)
else if(linelength == 4)
- visible_message("[src] says, 'Winner! You win four hundred credits!'")
+ visible_message("[src] says, 'Winner! You win four hundred [MONEY_NAME]!'")
give_money(SMALL_PRIZE)
if(isliving(user) && (user in viewers(src)))
var/mob/living/living_user = user
diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm
index 9db7cf8cd4a..e5a32b706bd 100644
--- a/code/game/objects/items/cards_ids.dm
+++ b/code/game/objects/items/cards_ids.dm
@@ -550,7 +550,7 @@
if(isnull(registered_account) || registered_account.replaceable) //Same check we use when we check if we can assign an account
context[SCREENTIP_CONTEXT_ALT_RMB] = "Assign account"
else if(registered_account.account_balance > 0)
- context[SCREENTIP_CONTEXT_ALT_LMB] = "Withdraw credits"
+ context[SCREENTIP_CONTEXT_ALT_LMB] = "Withdraw [MONEY_NAME]"
if(trim && length(trim.honorifics))
context[SCREENTIP_CONTEXT_CTRL_LMB] = "Toggle honorific"
return CONTEXTUAL_SCREENTIP_SET
@@ -676,7 +676,7 @@
var/money_added = mass_insert_money(money_contained, user)
if(!money_added)
return ITEM_INTERACT_BLOCKING
- to_chat(user, span_notice("You stuff the contents into the card! They disappear in a puff of bluespace smoke, adding [money_added] worth of credits to the linked account."))
+ to_chat(user, span_notice("You stuff the contents into the card! They disappear in a puff of bluespace smoke, adding [money_added] worth of [MONEY_NAME] to the linked account."))
return ITEM_INTERACT_SUCCESS
return NONE
@@ -703,13 +703,13 @@
return FALSE
registered_account.adjust_money(cash_money, "System: Deposit")
SSblackbox.record_feedback("amount", "credits_inserted", cash_money)
- log_econ("[cash_money] credits were inserted into [src] owned by [src.registered_name]")
+ log_econ("[cash_money] [MONEY_NAME] were inserted into [src] owned by [src.registered_name]")
if(physical_currency)
- to_chat(user, span_notice("You stuff [money] into [src]. It disappears in a small puff of bluespace smoke, adding [cash_money] credits to the linked account."))
+ to_chat(user, span_notice("You stuff [money] into [src]. It disappears in a small puff of bluespace smoke, adding [cash_money] [MONEY_NAME] to the linked account."))
else
- to_chat(user, span_notice("You insert [money] into [src], adding [cash_money] credits to the linked account."))
+ to_chat(user, span_notice("You insert [money] into [src], adding [cash_money] [MONEY_NAME] to the linked account."))
- to_chat(user, span_notice("The linked account now reports a balance of [registered_account.account_balance] cr."))
+ to_chat(user, span_notice("The linked account now reports a balance of [registered_account.account_balance] [MONEY_SYMBOL]."))
qdel(money)
return TRUE
@@ -736,7 +736,7 @@
registered_account.adjust_money(total, "System: Deposit")
SSblackbox.record_feedback("amount", "credits_inserted", total)
- log_econ("[total] credits were inserted into [src] owned by [src.registered_name]")
+ log_econ("[total] [MONEY_NAME] were inserted into [src] owned by [src.registered_name]")
QDEL_LIST(money)
return total
@@ -772,7 +772,7 @@
account.account_balance += old_account.account_balance
account.bank_cards += src
registered_account = account
- to_chat(user, span_notice("The provided account has been linked to this ID card. It contains [account.account_balance] credits."))
+ to_chat(user, span_notice("The provided account has been linked to this ID card. It contains [account.account_balance] [MONEY_NAME]."))
return TRUE
/obj/item/card/id/click_alt(mob/living/user)
@@ -798,20 +798,20 @@
if(choice == "Link Account")
set_new_account(user)
return CLICK_ACTION_SUCCESS
- var/amount_to_remove = tgui_input_number(user, "How much do you want to withdraw? (Max: [registered_account.account_balance] cr)", "Withdraw Funds", max_value = registered_account.account_balance)
+ var/amount_to_remove = tgui_input_number(user, "How much do you want to withdraw? (Max: [registered_account.account_balance] [MONEY_SYMBOL])", "Withdraw Funds", max_value = registered_account.account_balance)
if(!amount_to_remove || QDELETED(user) || QDELETED(src) || issilicon(user) || loc != user)
return CLICK_ACTION_BLOCKING
if(!alt_click_can_use_id(user))
return CLICK_ACTION_BLOCKING
if(!registered_account.adjust_money(-amount_to_remove, "System: Withdrawal"))
var/difference = amount_to_remove - registered_account.account_balance
- registered_account.bank_card_talk(span_warning("ERROR: The linked account requires [difference] more credit\s to perform that withdrawal."), TRUE)
+ registered_account.bank_card_talk(span_warning("ERROR: The linked account requires [difference] more [MONEY_NAME_AUTOPURAL(difference)] to perform that withdrawal."), TRUE)
return CLICK_ACTION_BLOCKING
var/obj/item/holochip/holochip = new (user.drop_location(), amount_to_remove)
user.put_in_hands(holochip)
- to_chat(user, span_notice("You withdraw [amount_to_remove] credits into a holochip."))
+ to_chat(user, span_notice("You withdraw [amount_to_remove] [MONEY_NAME] into a holochip."))
SSblackbox.record_feedback("amount", "credits_removed", amount_to_remove)
- log_econ("[amount_to_remove] credits were removed from [src] owned by [registered_name]")
+ log_econ("[amount_to_remove] [MONEY_NAME] were removed from [src] owned by [registered_name]")
return CLICK_ACTION_SUCCESS
@@ -822,15 +822,15 @@
set_new_account(user)
/obj/item/card/id/proc/pay_debt(user)
- var/amount_to_pay = tgui_input_number(user, "How much do you want to pay? (Max: [registered_account.account_balance] cr)", "Debt Payment", max_value = min(registered_account.account_balance, registered_account.account_debt))
+ var/amount_to_pay = tgui_input_number(user, "How much do you want to pay? (Max: [registered_account.account_balance] [MONEY_SYMBOL])", "Debt Payment", max_value = min(registered_account.account_balance, registered_account.account_debt))
if(!amount_to_pay || QDELETED(src) || loc != user || !alt_click_can_use_id(user))
return
var/prev_debt = registered_account.account_debt
var/amount_paid = registered_account.pay_debt(amount_to_pay)
if(amount_paid)
- var/message = span_notice("You pay [amount_to_pay] credits of a [prev_debt] cr debt. [registered_account.account_debt] cr to go.")
+ var/message = span_notice("You pay [amount_to_pay] [MONEY_NAME] of a [prev_debt] [MONEY_SYMBOL] debt. [registered_account.account_debt] [MONEY_SYMBOL] to go.")
if(!registered_account.account_debt)
- message = span_nicegreen("You pay the last [amount_to_pay] credits of your debt, extinguishing it. Congratulations!")
+ message = span_nicegreen("You pay the last [amount_to_pay] [MONEY_NAME] of your debt, extinguishing it. Congratulations!")
to_chat(user, message)
/obj/item/card/id/examine(mob/user)
@@ -839,10 +839,10 @@
return
if(registered_account && !isnull(registered_account.account_id))
- . += "The account linked to the ID belongs to '[registered_account.account_holder]' and reports a balance of [registered_account.account_balance] cr."
+ . += "The account linked to the ID belongs to '[registered_account.account_holder]' and reports a balance of [registered_account.account_balance] [MONEY_SYMBOL]."
if(ACCESS_COMMAND in access)
var/datum/bank_account/linked_dept = SSeconomy.get_dep_account(registered_account.account_job.paycheck_department)
- . += "The [linked_dept.account_holder] linked to the ID reports a balance of [linked_dept.account_balance] cr."
+ . += "The [linked_dept.account_holder] linked to the ID reports a balance of [linked_dept.account_balance] [MONEY_SYMBOL]."
else
. += span_notice("Alt-Right-Click the ID to set the linked bank account.")
@@ -882,15 +882,15 @@
if(registered_account)
if(registered_account.mining_points)
. += "There's [registered_account.mining_points] mining point\s loaded onto the card's bank account."
- . += "The account linked to the ID belongs to '[registered_account.account_holder]' and reports a balance of [registered_account.account_balance] cr."
+ . += "The account linked to the ID belongs to '[registered_account.account_holder]' and reports a balance of [registered_account.account_balance] [MONEY_SYMBOL]."
if(registered_account.account_debt)
- . += span_warning("The account is currently indebted for [registered_account.account_debt] cr. [100*DEBT_COLLECTION_COEFF]% of all earnings will go towards extinguishing it.")
+ . += span_warning("The account is currently indebted for [registered_account.account_debt] [MONEY_SYMBOL]. [100*DEBT_COLLECTION_COEFF]% of all earnings will go towards extinguishing it.")
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] cr."
+ . += "The [D.account_holder] reports a balance of [D.account_balance] [MONEY_SYMBOL]."
. += span_info("Alt-Click the ID to pull money from the linked account in the form of holochips.")
- . += span_info("You can insert credits into the linked account by pressing holochips, cash, or coins against the ID.")
+ . += span_info("You can insert [MONEY_NAME] into the linked account by pressing holochips, cash, or coins against the ID.")
if(registered_account.replaceable)
. += span_info("Alt-Right-Click the ID to change the linked bank account.")
if(registered_account.civilian_bounty)
diff --git a/code/game/objects/items/credit_holochip.dm b/code/game/objects/items/credit_holochip.dm
index 59c5339c314..8da91ef371a 100644
--- a/code/game/objects/items/credit_holochip.dm
+++ b/code/game/objects/items/credit_holochip.dm
@@ -16,7 +16,7 @@
if(!credits && amount)
credits = amount
if(credits <= 0 && !mapload)
- stack_trace("Holochip created with 0 or less credits in [get_area_name(src)]!")
+ stack_trace("Holochip created with 0 or less [MONEY_NAME] in [get_area_name(src)]!")
return INITIALIZE_HINT_QDEL
add_traits(list(TRAIT_FISHING_BAIT, TRAIT_BAIT_ALLOW_FISHING_DUD), INNATE_TRAIT)
update_appearance()
@@ -24,20 +24,20 @@
/obj/item/holochip/examine(mob/user)
. = ..()
- . += "[span_notice("It's loaded with [credits] credit[( credits > 1 ) ? "s" : ""]")]\n"+\
+ . += "[span_notice("It's loaded with [credits] [MONEY_NAME_AUTOPURAL(credits)]")]\n"+\
span_notice("Alt-Click to split.")
/obj/item/holochip/add_context(atom/source, list/context, obj/item/held_item, mob/living/user)
if(istype(held_item, /obj/item/holochip))
context[SCREENTIP_CONTEXT_LMB] = "Merge Into"
- context[SCREENTIP_CONTEXT_ALT_LMB] = "Extract Credits"
+ context[SCREENTIP_CONTEXT_ALT_LMB] = "Extract [MONEY_NAME_CAPITALIZED]"
return CONTEXTUAL_SCREENTIP_SET
/obj/item/holochip/get_item_credit_value()
return credits
/obj/item/holochip/update_name()
- name = "\improper [credits] credit holochip"
+ name = "\improper [credits] [MONEY_NAME_SINGULAR] holochip"
return ..()
/obj/item/holochip/update_icon_state()
@@ -117,7 +117,7 @@
if(loc != user)
to_chat(user, span_warning("You must be holding the holochip to continue!"))
return CLICK_ACTION_BLOCKING
- var/split_amount = tgui_input_number(user, "How many credits do you want to extract from the holochip? (Max: [credits] cr)", "Holochip", max_value = credits)
+ var/split_amount = tgui_input_number(user, "How many [MONEY_NAME] do you want to extract from the holochip? (Max: [credits] [MONEY_SYMBOL])", "Holochip", max_value = credits)
if(!split_amount || QDELETED(user) || QDELETED(src) || issilicon(user) || !usr.can_perform_action(src, NEED_DEXTERITY|FORBID_TELEKINESIS_REACH) || loc != user)
return CLICK_ACTION_BLOCKING
var/new_credits = spend(split_amount, TRUE)
@@ -126,7 +126,7 @@
if(!user.put_in_hands(chip))
chip.forceMove(user.drop_location())
add_fingerprint(user)
- to_chat(user, span_notice("You extract [split_amount] credits into a new holochip."))
+ to_chat(user, span_notice("You extract [split_amount] [MONEY_NAME] into a new holochip."))
return CLICK_ACTION_SUCCESS
/obj/item/holochip/emp_act(severity)
diff --git a/code/game/objects/items/stacks/cash.dm b/code/game/objects/items/stacks/cash.dm
index 5541c90895e..cbbab21f5d5 100644
--- a/code/game/objects/items/stacks/cash.dm
+++ b/code/game/objects/items/stacks/cash.dm
@@ -23,7 +23,7 @@
/obj/item/stack/spacecash/update_desc()
. = ..()
var/total_worth = get_item_credit_value()
- desc = "It's worth [total_worth] credit[(total_worth > 1) ? "s" : null] in total."
+ desc = "It's worth [total_worth] [MONEY_NAME_AUTOPURAL(total_worth)] in total."
/obj/item/stack/spacecash/get_item_credit_value()
return (amount*value)
diff --git a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm
index 2eb7fecaf50..3f3d06534a0 100644
--- a/code/game/objects/structures/displaycase.dm
+++ b/code/game/objects/structures/displaycase.dm
@@ -563,7 +563,7 @@
if(payments_acc)
payments_acc.adjust_money(sale_price, "Display Case: [capitalize(showpiece.name)]")
usr.put_in_hands(showpiece)
- to_chat(usr, span_notice("You purchase [showpiece] for [sale_price] credits."))
+ to_chat(usr, span_notice("You purchase [showpiece] for [sale_price] [MONEY_NAME]."))
playsound(src, 'sound/effects/cashregister.ogg', 40, TRUE)
flick("[initial(icon_state)]_vend", src)
showpiece = null
@@ -666,7 +666,7 @@
/obj/structure/displaycase/forsale/examine(mob/user)
. = ..()
if(showpiece && !open)
- . += span_notice("[showpiece] is for sale for [sale_price] credits.")
+ . += span_notice("[showpiece] is for sale for [sale_price] [MONEY_NAME].")
if(broken)
. += span_notice("[src] is sparking and the hover field generator seems to be overloaded. Use a multitool to fix it.")
diff --git a/code/modules/admin/smites/dock_pay.dm b/code/modules/admin/smites/dock_pay.dm
index a3828feb828..6eaa7b53792 100644
--- a/code/modules/admin/smites/dock_pay.dm
+++ b/code/modules/admin/smites/dock_pay.dm
@@ -18,14 +18,14 @@
if (card.registered_account.account_balance == 0)
to_chat(user, span_warning("ID Card lacks any funds. No pay to dock."))
return
- var/new_cost = input("How much pay are we docking? Current balance: [card.registered_account.account_balance] credits.", "BUDGET CUTS") as num|null
+ var/new_cost = input("How much pay are we docking? Current balance: [card.registered_account.account_balance] [MONEY_NAME].", "BUDGET CUTS") as num|null
if (!new_cost)
return
if (!(card.registered_account.has_money(new_cost)))
to_chat(user, span_warning("ID Card lacked funds. Emptying account."))
- card.registered_account.bank_card_talk("[new_cost] credits deducted from your account based on performance review.")
+ card.registered_account.bank_card_talk("[new_cost] [MONEY_NAME] deducted from your account based on performance review.")
card.registered_account.account_balance = 0
else
card.registered_account.account_balance = card.registered_account.account_balance - new_cost
- card.registered_account.bank_card_talk("[new_cost] credits deducted from your account based on performance review.")
+ card.registered_account.bank_card_talk("[new_cost] [MONEY_NAME] deducted from your account based on performance review.")
SEND_SOUND(target, 'sound/machines/buzz/buzz-sigh.ogg')
diff --git a/code/modules/antagonists/pirate/pirate.dm b/code/modules/antagonists/pirate/pirate.dm
index e4899a8eca3..7b09a2540ec 100644
--- a/code/modules/antagonists/pirate/pirate.dm
+++ b/code/modules/antagonists/pirate/pirate.dm
@@ -12,7 +12,7 @@
/datum/antagonist/pirate/greet()
. = ..()
- to_chat(owner, "The station refused to pay for your protection. Protect the ship, siphon the credits from the station, and raid it for even more loot.")
+ to_chat(owner, "The station refused to pay for your protection. Protect the ship, siphon the [MONEY_NAME] from the station, and raid it for even more loot.")
owner.announce_objectives()
/datum/antagonist/pirate/get_team()
@@ -81,7 +81,7 @@
/datum/objective/loot/update_explanation_text()
if(cargo_hold)
var/area/storage_area = get_area(cargo_hold)
- explanation_text = "Acquire loot and store [target_value] of credits worth in [storage_area.name] cargo hold."
+ explanation_text = "Acquire loot and store [target_value] of [MONEY_NAME] worth in [storage_area.name] cargo hold."
/datum/objective/loot/proc/loot_listing()
//Lists notable loot.
@@ -117,7 +117,7 @@
parts += "Loot stolen: "
var/datum/objective/loot/L = locate() in objectives
parts += L.loot_listing()
- parts += "Total loot value : [L.get_loot_value()]/[L.target_value] credits"
+ parts += "Total loot value : [L.get_loot_value()]/[L.target_value] [MONEY_NAME]"
if(L.check_completion() && !all_dead)
parts += "The pirate crew was successful!"
diff --git a/code/modules/antagonists/pirate/pirate_shuttle_equipment.dm b/code/modules/antagonists/pirate/pirate_shuttle_equipment.dm
index db02d51f65b..f48267356eb 100644
--- a/code/modules/antagonists/pirate/pirate_shuttle_equipment.dm
+++ b/code/modules/antagonists/pirate/pirate_shuttle_equipment.dm
@@ -65,7 +65,7 @@
/obj/machinery/shuttle_scrambler/proc/dump_loot(mob/user)
if(credits_stored) // Prevents spamming empty holochips
new /obj/item/holochip(drop_location(), credits_stored)
- to_chat(user,span_notice("You retrieve the siphoned credits!"))
+ to_chat(user,span_notice("You retrieve the siphoned [MONEY_NAME]!"))
credits_stored = 0
else
to_chat(user,span_notice("There's nothing to withdraw."))
diff --git a/code/modules/antagonists/traitor/contractor/syndicate_contract.dm b/code/modules/antagonists/traitor/contractor/syndicate_contract.dm
index 71ae454df72..fb1212fb931 100644
--- a/code/modules/antagonists/traitor/contractor/syndicate_contract.dm
+++ b/code/modules/antagonists/traitor/contractor/syndicate_contract.dm
@@ -141,7 +141,7 @@
return
contractor_id.registered_account.adjust_money(ransom * 0.35)
contractor_id.registered_account.bank_card_talk("We've processed the ransom, agent. \
- Here's your cut - your balance is now [contractor_id.registered_account.account_balance] cr.", TRUE)
+ Here's your cut - your balance is now [contractor_id.registered_account.account_balance] [MONEY_SYMBOL].", TRUE)
#define VICTIM_EXPERIENCE_START 0
#define VICTIM_EXPERIENCE_FIRST_HIT 1
diff --git a/code/modules/art/paintings.dm b/code/modules/art/paintings.dm
index 3e34ba63106..8b8ee4a5ebb 100644
--- a/code/modules/art/paintings.dm
+++ b/code/modules/art/paintings.dm
@@ -318,7 +318,7 @@
if(curator_cut)
for(var/datum/bank_account/curator as anything in curator_accounts)
curator.adjust_money(curator_cut, "Painting: Patronage cut")
- curator.bank_card_talk("Cut on patronage received, account now holds [curator.account_balance] cr.")
+ curator.bank_card_talk("Cut on patronage received, account now holds [curator.account_balance] [MONEY_SYMBOL].")
if(istype(loc, /obj/structure/sign/painting))
var/obj/structure/sign/painting/frame = loc
diff --git a/code/modules/cargo/exports.dm b/code/modules/cargo/exports.dm
index 03fcdcb9180..78241aa6d74 100644
--- a/code/modules/cargo/exports.dm
+++ b/code/modules/cargo/exports.dm
@@ -237,7 +237,7 @@ Then the player gets the profit from selling his own wasted time.
var/total_value = ex.total_value[src]
var/total_amount = ex.total_amount[src]
- var/msg = "[total_value] credits: Received [total_amount] "
+ var/msg = "[total_value] [MONEY_NAME]: Received [total_amount] "
if(total_value > 0)
msg = "+" + msg
diff --git a/code/modules/cargo/expressconsole.dm b/code/modules/cargo/expressconsole.dm
index 86a4d4f3a4f..5bc0337fa0d 100644
--- a/code/modules/cargo/expressconsole.dm
+++ b/code/modules/cargo/expressconsole.dm
@@ -119,7 +119,7 @@
data["beaconError"] = using_beacon && !canBeacon ? "(BEACON ERROR)" : ""//changes button text to include an error alert if necessary
data["hasBeacon"] = beacon != null//is there a linked beacon?
data["beaconName"] = beacon ? beacon.name : "No Beacon Found"
- data["printMsg"] = COOLDOWN_FINISHED(src, beacon_print_cooldown) ? "Print Beacon for [BEACON_COST] credits" : "Print Beacon for [BEACON_COST] credits ([COOLDOWN_TIMELEFT(src, beacon_print_cooldown)])" //buttontext for printing beacons
+ data["printMsg"] = COOLDOWN_FINISHED(src, beacon_print_cooldown) ? "Print Beacon for [BEACON_COST] [MONEY_NAME]" : "Print Beacon for [BEACON_COST] [MONEY_NAME] ([COOLDOWN_TIMELEFT(src, beacon_print_cooldown)])" //buttontext for printing beacons
data["supplies"] = list()
message = "Sales are near-instantaneous - please choose carefully."
if(SSshuttle.supply_blocked)
diff --git a/code/modules/cargo/markets/_market.dm b/code/modules/cargo/markets/_market.dm
index e2a21eb12eb..4212ac63d86 100644
--- a/code/modules/cargo/markets/_market.dm
+++ b/code/modules/cargo/markets/_market.dm
@@ -61,7 +61,7 @@
// I can't get the price of the item and shipping in a clean way to the UI, so I have to do this.
if(balance < price)
- to_chat(user, span_warning("You don't have enough credits in [uplink] for [item] with [method] shipping."))
+ to_chat(user, span_warning("You don't have enough [MONEY_NAME] in [uplink] for [item] with [method] shipping."))
return FALSE
if(item.buy(uplink, user, method, legal_status))
diff --git a/code/modules/cargo/markets/market_telepad.dm b/code/modules/cargo/markets/market_telepad.dm
index ea04c1f5bb9..445cd329603 100644
--- a/code/modules/cargo/markets/market_telepad.dm
+++ b/code/modules/cargo/markets/market_telepad.dm
@@ -93,8 +93,8 @@
. = ..()
if(!(machine_stat & NOPOWER))
. += span_info("A small display reads:")
- . += span_tinynoticeital("Current market restock price: [EXAMINE_HINT("[restock_cost] cr")].")
- . += span_tinynoticeital("Market placement fee: [EXAMINE_HINT("[PLACE_ON_MARKET_COST] cr")].")
+ . += span_tinynoticeital("Current market restock price: [EXAMINE_HINT("[restock_cost] [MONEY_SYMBOL]")].")
+ . += span_tinynoticeital("Market placement fee: [EXAMINE_HINT("[PLACE_ON_MARKET_COST] [MONEY_SYMBOL]")].")
. += span_tinynoticeital("Withholding tax on local items: [EXAMINE_HINT("[MARKET_WITHHOLDING_TAX * 100]%")].")
/obj/machinery/ltsrbt/update_icon_state()
@@ -192,7 +192,7 @@
return
if(creds_value < restock_cost)
- say("Insufficient credits!")
+ say("Insufficient [MONEY_NAME]!")
playsound(src, 'sound/machines/buzz/buzz-sigh.ogg', 40, FALSE)
return ITEM_INTERACT_BLOCKING
@@ -289,7 +289,7 @@
playsound(src, 'sound/machines/buzz/buzz-sigh.ogg', 40, FALSE)
return
if(!card.registered_account.adjust_money(-PLACE_ON_MARKET_COST, "Market: Placement Fee"))
- say("Insufficient credits!")
+ say("Insufficient [MONEY_NAME]!")
playsound(src, 'sound/machines/buzz/buzz-sigh.ogg', 40, FALSE)
return
account = card.registered_account
diff --git a/code/modules/cargo/markets/market_uplink.dm b/code/modules/cargo/markets/market_uplink.dm
index d3408f804ae..5585f434c23 100644
--- a/code/modules/cargo/markets/market_uplink.dm
+++ b/code/modules/cargo/markets/market_uplink.dm
@@ -56,7 +56,7 @@
current_user = null
data["categories"] = market ? market.categories : null
data["delivery_methods"] = list()
- data["money"] = "N/A cr"
+ data["money"] = "N/A [MONEY_SYMBOL]"
if(current_user)
data["money"] = current_user.account_balance
data["buying"] = buying
diff --git a/code/modules/cargo/materials_market.dm b/code/modules/cargo/materials_market.dm
index 22983d671e2..83b047957c9 100644
--- a/code/modules/cargo/materials_market.dm
+++ b/code/modules/cargo/materials_market.dm
@@ -71,7 +71,7 @@
var/obj/item/stock_block/new_block = new /obj/item/stock_block(drop_location())
new_block.export_value = price
new_block.set_custom_materials(materials)
- to_chat(user, span_notice("You have created a stock block worth [new_block.export_value * exportable.amount] cr! Sell it before it becomes liquid!"))
+ to_chat(user, span_notice("You have created a stock block worth [new_block.export_value * exportable.amount] [MONEY_SYMBOL]! Sell it before it becomes liquid!"))
playsound(src, 'sound/machines/synth/synth_yes.ogg', 50, FALSE)
qdel(exportable)
use_energy(active_power_usage)
@@ -363,7 +363,7 @@
var/datum/material/export_mat = custom_materials[1]
var/quantity = custom_materials[export_mat] / SHEET_MATERIAL_AMOUNT
- . += span_notice("\The [src] is worth [quantity * export_value] cr, from selling [quantity] sheets of [export_mat.name].")
+ . += span_notice("\The [src] is worth [quantity * export_value] [MONEY_SYMBOL], from selling [quantity] sheets of [export_mat.name].")
if(fluid)
. += span_warning("\The [src] is currently liquid! Its value is based on the market price.")
diff --git a/code/modules/cargo/universal_scanner.dm b/code/modules/cargo/universal_scanner.dm
index 01d9f4e7f55..9668c4c0bea 100644
--- a/code/modules/cargo/universal_scanner.dm
+++ b/code/modules/cargo/universal_scanner.dm
@@ -120,7 +120,7 @@
if(!chosen_price || QDELETED(user) || QDELETED(src) || !user.can_perform_action(src, FORBID_TELEKINESIS_REACH) || loc != user)
return
new_custom_price = chosen_price
- to_chat(user, span_notice("[src] will now give things a [new_custom_price] cr tag."))
+ to_chat(user, span_notice("[src] will now give things a [new_custom_price] [MONEY_SYMBOL] tag."))
/obj/item/universal_scanner/item_ctrl_click(mob/user)
. = CLICK_ACTION_BLOCKING
@@ -149,7 +149,7 @@
. += span_notice("Ctrl-click to clear the registered account.")
if(scanning_mode == SCAN_PRICE_TAG)
- . += span_notice("The current custom price is set to [new_custom_price] cr. Right-click to change.")
+ . += span_notice("The current custom price is set to [new_custom_price] [MONEY_SYMBOL]. Right-click to change.")
/obj/item/universal_scanner/add_context(atom/source, list/context, obj/item/held_item, mob/user)
switch(scanning_mode)
@@ -178,7 +178,7 @@
if(length(target.contents))
message = "Scanned [target] and its contents"
if(price)
- message += ", total value: [price] credits"
+ message += ", total value: [price] [MONEY_NAME]"
else
message += ", no export values"
warning = TRUE
@@ -190,7 +190,7 @@
message += ", unable to determine value."
warning = TRUE
else if(price)
- message += ", value: [price] credits."
+ message += ", value: [price] [MONEY_NAME]."
else
message += ", no export value."
warning = TRUE
@@ -231,7 +231,7 @@
cube.AddComponent(/datum/component/pricetag, scanner_account, cube.handler_tip, FALSE)
cube.bounty_handler_account = scanner_account
- cube.bounty_handler_account.bank_card_talk("Bank account for [price ? "[price * cube.handler_tip] credit " : ""]handling tip successfully registered.")
+ cube.bounty_handler_account.bank_card_talk("Bank account for [price ? "[price * cube.handler_tip] [MONEY_NAME_SINGULAR] " : ""]handling tip successfully registered.")
if(cube.bounty_holder_account != cube.bounty_handler_account) //No need to send a tracking update to the person scanning it
cube.bounty_holder_account.bank_card_talk("[cube] was scanned in \the [get_area(cube)] by [scan_human] ([scan_human.job]).")
@@ -246,7 +246,7 @@
if(isitem(target))
var/obj/item/selected_target = target
selected_target.custom_price = new_custom_price
- to_chat(user, span_notice("You set the price of [selected_target] to [new_custom_price] cr."))
+ to_chat(user, span_notice("You set the price of [selected_target] to [new_custom_price] [MONEY_SYMBOL]."))
/**
* check_menu: Checks if we are allowed to interact with a radial menu
diff --git a/code/modules/clothing/neck/_neck.dm b/code/modules/clothing/neck/_neck.dm
index d54f9c57175..07318432965 100644
--- a/code/modules/clothing/neck/_neck.dm
+++ b/code/modules/clothing/neck/_neck.dm
@@ -548,7 +548,8 @@
if(price)
var/true_price = round(price*profit_scaling)
- to_chat(user, span_notice("[selling ? "Sold" : "Getting the price of"] [interacting_with], value: [true_price] credits[interacting_with.contents.len ? " (exportable contents included)" : ""].[profit_scaling < 1 && selling ? "[round(price-true_price)] credit\s taken as processing fee\s." : ""]"))
+ var/fee_display = round(price-true_price)
+ to_chat(user, span_notice("[selling ? "Sold" : "Getting the price of"] [interacting_with], value: [true_price] [MONEY_NAME][interacting_with.contents.len ? " (exportable contents included)" : ""].[profit_scaling < 1 && selling ? "[fee_display] [MONEY_NAME_AUTOPURAL(fee_display)] taken as processing fee\s." : ""]"))
if(selling)
new /obj/item/holochip(get_turf(user), true_price)
else
diff --git a/code/modules/economy/account.dm b/code/modules/economy/account.dm
index 986def70031..f429a97dd6f 100644
--- a/code/modules/economy/account.dm
+++ b/code/modules/economy/account.dm
@@ -152,7 +152,7 @@
return 0
else
add_log_to_history(-amount, "Other: Debt Collection")
- log_econ("[amount_to_pay] credits were removed from [account_holder]'s bank account to pay a debt of [account_debt]")
+ log_econ("[amount_to_pay] [MONEY_NAME] were removed from [account_holder]'s bank account to pay a debt of [account_debt]")
account_debt -= amount_to_pay
SEND_SIGNAL(src, COMSIG_BANK_ACCOUNT_DEBT_PAID)
return amount_to_pay
@@ -180,7 +180,7 @@
adjust_money(amount, reason_to)
from.adjust_money(-amount, reason_from)
SSblackbox.record_feedback("amount", "credits_transferred", amount)
- log_econ("[amount] credits were transferred from [from.account_holder]'s account to [src.account_holder]")
+ log_econ("[amount] [MONEY_NAME] were transferred from [from.account_holder]'s account to [src.account_holder]")
return TRUE
return FALSE
@@ -212,7 +212,7 @@
adjust_money(money_to_transfer, "Nanotrasen: Shift Payment")
SSblackbox.record_feedback("amount", "free_income", money_to_transfer)
SSeconomy.station_target += money_to_transfer
- log_econ("[money_to_transfer] credits were given to [src.account_holder]'s account from income.")
+ log_econ("[money_to_transfer] [MONEY_NAME] were given to [src.account_holder]'s account from income.")
return TRUE
var/datum/bank_account/department_account = SSeconomy.get_dep_account(account_job.paycheck_department)
if(isnull(department_account))
@@ -221,7 +221,7 @@
if(!transfer_money(department_account, money_to_transfer))
bank_card_talk("ERROR: [event] aborted, departmental funds insufficient.")
return FALSE
- bank_card_talk("[event] processed, account now holds [account_balance] cr.")
+ bank_card_talk("[event] processed, account now holds [account_balance] [MONEY_SYMBOL].")
return TRUE
/**
diff --git a/code/modules/economy/holopay.dm b/code/modules/economy/holopay.dm
index 45eb59c8135..3043296b72a 100644
--- a/code/modules/economy/holopay.dm
+++ b/code/modules/economy/holopay.dm
@@ -27,7 +27,7 @@
/obj/structure/holopay/examine(mob/user)
. = ..()
if(force_fee)
- . += span_boldnotice("This holopay forces a payment of [force_fee] credit\s per swipe instead of a variable amount.")
+ . += span_boldnotice("This holopay forces a payment of [force_fee] [MONEY_NAME_AUTOPURAL(force_fee)] per swipe instead of a variable amount.")
/obj/structure/holopay/Initialize(mapload)
. = ..()
@@ -80,7 +80,7 @@
return ..()
/// Users can pay with an ID to skip the UI
if(isidcard(held_item))
- if(force_fee && tgui_alert(item_holder, "This holopay has a [force_fee] cr fee. Confirm?", "Holopay Fee", list("Pay", "Cancel")) != "Pay")
+ if(force_fee && tgui_alert(item_holder, "This holopay has a [force_fee] [MONEY_SYMBOL] fee. Confirm?", "Holopay Fee", list("Pay", "Cancel")) != "Pay")
return TRUE
process_payment(user)
return TRUE
@@ -90,7 +90,7 @@
var/obj/item/holochip/chip = held_item
if(!chip.credits)
balloon_alert(user, "holochip is empty")
- to_chat(user, span_warning("There doesn't seem to be any credits here."))
+ to_chat(user, span_warning("There doesn't seem to be any [MONEY_NAME] here."))
return FALSE
/// Charges force fee or uses pay what you want
var/cash_deposit = force_fee || tgui_input_number(user, "How much? (Max: [chip.credits])", "Patronage", max_value = chip.credits)
@@ -100,8 +100,8 @@
if(QDELETED(held_item) || QDELETED(user) || QDELETED(src) || !user.can_perform_action(src, FORBID_TELEKINESIS_REACH))
return FALSE
if(!chip.spend(cash_deposit, FALSE))
- balloon_alert(user, "insufficient credits")
- to_chat(user, span_warning("You don't have enough credits to pay with this chip."))
+ balloon_alert(user, "insufficient [MONEY_NAME]")
+ to_chat(user, span_warning("You don't have enough [MONEY_NAME] to pay with this chip."))
return FALSE
/// Success: Alert buyer
alert_buyer(user, cash_deposit)
@@ -270,7 +270,7 @@
if(!amount || QDELETED(user) || QDELETED(src) || !user.can_perform_action(src, FORBID_TELEKINESIS_REACH))
return FALSE
if(!payee.adjust_money(-amount, "Holopay: [capitalize(name)]"))
- balloon_alert(user, "insufficient credits")
+ balloon_alert(user, "insufficient [MONEY_NAME]")
to_chat(user, span_warning("You don't have the money to pay for this."))
return FALSE
/// Success: Alert the buyer
@@ -290,10 +290,10 @@
/// Pay the owner
linked_card.registered_account.adjust_money(amount, "Holopay: [name]")
/// Make alerts
- linked_card.registered_account.bank_card_talk("[payee] has deposited [amount] cr at your holographic pay stand.")
+ linked_card.registered_account.bank_card_talk("[payee] has deposited [amount] [MONEY_SYMBOL] at your holographic pay stand.")
say("Thank you for your patronage, [payee]!")
playsound(src, 'sound/effects/cashregister.ogg', 20, TRUE)
/// Log the event
- log_econ("[amount] credits were transferred from [payee]'s transaction to [linked_card.registered_account.account_holder]")
+ log_econ("[amount] [MONEY_NAME] were transferred from [payee]'s transaction to [linked_card.registered_account.account_holder]")
SSblackbox.record_feedback("amount", "credits_transferred", amount)
return TRUE
diff --git a/code/modules/lost_crew/lost_crew_manager.dm b/code/modules/lost_crew/lost_crew_manager.dm
index 22dc887393a..1494204ad71 100644
--- a/code/modules/lost_crew/lost_crew_manager.dm
+++ b/code/modules/lost_crew/lost_crew_manager.dm
@@ -82,7 +82,7 @@ GLOBAL_DATUM_INIT(lost_crew_manager, /datum/lost_crew_manager, new)
owner.mind.add_antag_datum(/datum/antagonist/recovered_crew) //for tracking mostly
var/datum/bank_account/bank_account = new(owner.real_name, owner.mind.assigned_role, owner.dna.species.payday_modifier)
- bank_account.adjust_money(starting_funds, "[starting_funds]cr given to [owner.name] as starting fund.")
+ bank_account.adjust_money(starting_funds, "[starting_funds][MONEY_SYMBOL] given to [owner.name] as starting fund.")
owner.account_id = bank_account.account_id
bank_account.replaceable = FALSE
diff --git a/code/modules/mining/ores_coins.dm b/code/modules/mining/ores_coins.dm
index 564cd18fe50..10b01bf5a8b 100644
--- a/code/modules/mining/ores_coins.dm
+++ b/code/modules/mining/ores_coins.dm
@@ -492,7 +492,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
/obj/item/coin/examine(mob/user)
. = ..()
- . += span_info("It's worth [value] credit\s.")
+ . += span_info("It's worth [value] [MONEY_NAME_AUTOPURAL(value)].")
/obj/item/coin/attackby(obj/item/W, mob/user, list/modifiers, list/attack_modifiers)
if(istype(W, /obj/item/stack/cable_coil))
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index d50417827cf..5c6445fbf27 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -337,7 +337,7 @@
var/datum/crime/citation/new_citation = new(name = citation_name, author = allowed_access, fine = fine)
target_record.citations += new_citation
- new_citation.alert_owner(usr, src, target_record.name, "You have been fined [fine] credits for '[citation_name]'. Fines may be paid at security.")
+ new_citation.alert_owner(usr, src, target_record.name, "You have been fined [fine] [MONEY_NAME] for '[citation_name]'. Fines may be paid at security.")
investigate_log("New Citation: [citation_name] Fine: [fine] | Added to [target_record.name] by [key_name(human_user)]", INVESTIGATE_RECORDS)
SSblackbox.ReportCitation(REF(new_citation), human_user.ckey, human_user.real_name, target_record.name, citation_name, null, fine)
diff --git a/code/modules/mob/living/simple_animal/bot/secbot.dm b/code/modules/mob/living/simple_animal/bot/secbot.dm
index 9630339022a..b6c0b63d65d 100644
--- a/code/modules/mob/living/simple_animal/bot/secbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/secbot.dm
@@ -594,7 +594,7 @@
nap_violation(target)
return FALSE
var/datum/bank_account/beepsky_department_account = SSeconomy.get_dep_account(payment_department)
- say("Thank you for your compliance. Your account been charged [fair_market_price] credits.")
+ say("Thank you for your compliance. Your account been charged [fair_market_price] [MONEY_NAME].")
if(beepsky_department_account)
beepsky_department_account.adjust_money(fair_market_price)
return TRUE
diff --git a/code/modules/modular_computers/file_system/programs/betting.dm b/code/modules/modular_computers/file_system/programs/betting.dm
index d368d15e8e7..98b827bcb4a 100644
--- a/code/modules/modular_computers/file_system/programs/betting.dm
+++ b/code/modules/modular_computers/file_system/programs/betting.dm
@@ -234,7 +234,7 @@ GLOBAL_LIST_EMPTY_TYPED(active_bets, /datum/active_bet)
//they only made their money back, don't tell them they won anything.
if((money_won - text2num(winner[2])) == 0)
continue
- winner_account.bank_card_talk("You won [money_won]cr from having a correct guess on [name]!")
+ winner_account.bank_card_talk("You won [money_won][MONEY_SYMBOL] from having a correct guess on [name]!")
///Puts a bank account's money bet on a given option.
/datum/active_bet/proc/bet_money(datum/bank_account/better, money_betting, option_betting)
@@ -255,7 +255,7 @@ GLOBAL_LIST_EMPTY_TYPED(active_bets, /datum/active_bet)
if(!better.adjust_money(-money_adding_in, "Gambling on [name]."))
return
total_amount_bet += money_adding_in
- better.bank_card_talk("Additional [money_adding_in]cr deducted for your bet on [name].")
+ better.bank_card_talk("Additional [money_adding_in][MONEY_SYMBOL] deducted for your bet on [name].")
existing_bets[2] = "[money_betting]"
return
//taking it all out, we remove them from the list so they aren't a winner with bets of 0.
@@ -269,7 +269,7 @@ GLOBAL_LIST_EMPTY_TYPED(active_bets, /datum/active_bet)
if(text2num(existing_bets[2]) > money_betting)
var/money_taking_out = text2num(existing_bets[2]) - money_betting
total_amount_bet -= money_taking_out
- better.bank_card_talk("Refunded [money_taking_out]cr for taking money out of your bet on [name].")
+ better.bank_card_talk("Refunded [money_taking_out][MONEY_SYMBOL] for taking money out of your bet on [name].")
better.adjust_money(money_taking_out, "Refund from gambling on [name].")
existing_bets[2] = "[money_betting]"
return
@@ -278,7 +278,7 @@ GLOBAL_LIST_EMPTY_TYPED(active_bets, /datum/active_bet)
return
total_amount_bet += money_betting
options[option_betting] += list(list(better, "[money_betting]"))
- better.bank_card_talk("Deducted [money_betting]cr for your bet on [name].")
+ better.bank_card_talk("Deducted [money_betting][MONEY_SYMBOL] for your bet on [name].")
///Cancels your bet, removing your bet and refunding your money.
/datum/active_bet/proc/cancel_bet(datum/bank_account/better)
@@ -287,7 +287,7 @@ GLOBAL_LIST_EMPTY_TYPED(active_bets, /datum/active_bet)
if(existing_bets[1] == better)
var/money_refunding = text2num(existing_bets[2])
total_amount_bet -= money_refunding
- better.bank_card_talk("Refunded [money_refunding]cr for cancelling your bet on [name].")
+ better.bank_card_talk("Refunded [money_refunding][MONEY_SYMBOL] for cancelling your bet on [name].")
better.adjust_money(money_refunding, "Refunded: changed bet for [name].")
options[option] -= list(existing_bets)
diff --git a/code/modules/modular_computers/file_system/programs/bounty_board.dm b/code/modules/modular_computers/file_system/programs/bounty_board.dm
index 1b132054473..37e9ddd7121 100644
--- a/code/modules/modular_computers/file_system/programs/bounty_board.dm
+++ b/code/modules/modular_computers/file_system/programs/bounty_board.dm
@@ -102,7 +102,7 @@
playsound(computer, 'sound/machines/buzz/buzz-sigh.ogg', 30, TRUE)
return
request_target.transfer_money(current_user, active_request.value, "Bounties: Request Completed")
- computer.say("Paid out [active_request.value] credits.")
+ computer.say("Paid out [active_request.value] [MONEY_NAME].")
GLOB.request_list.Remove(active_request)
return TRUE
if("clear")
diff --git a/code/modules/modular_computers/file_system/programs/nt_pay.dm b/code/modules/modular_computers/file_system/programs/nt_pay.dm
index 3138567d448..19f3c7bb198 100644
--- a/code/modules/modular_computers/file_system/programs/nt_pay.dm
+++ b/code/modules/modular_computers/file_system/programs/nt_pay.dm
@@ -83,7 +83,7 @@
return NT_PAY_STATUS_INVALID_MONEY
if(token == current_user.pay_token)
if(user)
- to_chat(user, span_notice("You can't send credits to yourself."))
+ to_chat(user, span_notice("You can't send [MONEY_NAME] to yourself."))
return NT_PAY_SATUS_SENDER_IS_RECEIVER
for(var/account in SSeconomy.bank_accounts_by_id)
@@ -100,12 +100,12 @@
current_user.bank_card_talk("You cannot afford it.")
return NT_PAY_STATUS_INVALID_MONEY
- recipient.bank_card_talk("You received [money_to_send] credit(s). Reason: transfer from [current_user.account_holder]")
+ recipient.bank_card_talk("You received [money_to_send] [MONEY_NAME](s). Reason: transfer from [current_user.account_holder]")
recipient.transfer_money(current_user, money_to_send)
for(var/obj/item/card/id/id_card as anything in recipient.bank_cards)
SEND_SIGNAL(id_card, COMSIG_ID_CARD_NTPAY_MONEY_RECEIVED, computer, money_to_send)
- current_user.bank_card_talk("You send [money_to_send] credit(s) to [recipient.account_holder]. Now you have [current_user.account_balance] credit(s)")
+ current_user.bank_card_talk("You send [money_to_send] [MONEY_NAME](s) to [recipient.account_holder]. Now you have [current_user.account_balance] [MONEY_NAME](s)")
return NT_PAY_STATUS_SUCCESS
diff --git a/code/modules/projectiles/pins.dm b/code/modules/projectiles/pins.dm
index d3059ac3fda..d00dc32ac1c 100644
--- a/code/modules/projectiles/pins.dm
+++ b/code/modules/projectiles/pins.dm
@@ -255,7 +255,7 @@
/obj/item/firing_pin/paywall/gun_insert(mob/living/user, obj/item/gun/new_gun, starting = FALSE)
if(pin_owner || starting)
. = ..()
- gun.desc += span_notice("This [gun.name] has a [multi_payment ? "per-shot" : "license permit"] cost of [payment_amount] credit[payment_amount > 1 ? "s" : ""].")
+ gun.desc += span_notice("This [gun.name] has a [multi_payment ? "per-shot" : "license permit"] cost of [payment_amount] [MONEY_NAME_AUTOPURAL(payment_amount)].")
return
if(isnull(user))
@@ -314,7 +314,7 @@
if(active_prompt_user == user)
return FALSE
active_prompt_user = user
- var/license_request = tgui_alert(user, "Do you wish to pay [payment_amount] credit[( payment_amount > 1 ) ? "s" : ""] for [( multi_payment ) ? "each shot of [gun.name]" : "usage license of [gun.name]"]?", "Weapon Purchase", list("Yes", "No"), 15 SECONDS)
+ var/license_request = tgui_alert(user, "Do you wish to pay [payment_amount] [MONEY_NAME_AUTOPURAL(payment_amount)] for [( multi_payment ) ? "each shot of [gun.name]" : "usage license of [gun.name]"]?", "Weapon Purchase", list("Yes", "No"), 15 SECONDS)
if(!user.can_perform_action(src))
active_prompt_user = null
return FALSE
diff --git a/code/modules/religion/religion_sects.dm b/code/modules/religion/religion_sects.dm
index ba8024fffe2..2f68a0153cf 100644
--- a/code/modules/religion/religion_sects.dm
+++ b/code/modules/religion/religion_sects.dm
@@ -276,7 +276,7 @@
return BLESSING_IGNORED
if(account.account_balance < GREEDY_HEAL_COST)
- to_chat(chap, span_warning("Healing from [GLOB.deity] costs [GREEDY_HEAL_COST] credits for 30 health!"))
+ to_chat(chap, span_warning("Healing from [GLOB.deity] costs [GREEDY_HEAL_COST] [MONEY_NAME] for 30 health!"))
return BLESSING_IGNORED
var/mob/living/carbon/human/blessed = blessed_living
diff --git a/code/modules/shuttle/misc/special.dm b/code/modules/shuttle/misc/special.dm
index c38e4c40a38..6b635fdec83 100644
--- a/code/modules/shuttle/misc/special.dm
+++ b/code/modules/shuttle/misc/special.dm
@@ -384,7 +384,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, span_notice("[payees[AM]] cr received. You need [threshold-payees[AM]] cr more."))
+ to_chat(AM, span_notice("[payees[AM]] [MONEY_SYMBOL] received. You need [threshold-payees[AM]] [MONEY_SYMBOL] more."))
check_times[AM] = world.time + LUXURY_MESSAGE_COOLDOWN
alarm_beep()
return ..()
diff --git a/code/modules/shuttle/mobile_port/variants/supply.dm b/code/modules/shuttle/mobile_port/variants/supply.dm
index 13938607f17..38e305bc349 100644
--- a/code/modules/shuttle/mobile_port/variants/supply.dm
+++ b/code/modules/shuttle/mobile_port/variants/supply.dm
@@ -196,14 +196,14 @@ GLOBAL_LIST_INIT(blacklisted_cargo_types, typecacheof(list(
var/list/current_buyer_orders = goodies_by_buyer[spawning_order.paying_account]
if(LAZYLEN(current_buyer_orders) == GOODY_FREE_SHIPPING_MAX)
price = round(price + CRATE_TAX)
- paying_for_this.bank_card_talk("Goody order size exceeds free shipping limit: Assessing [CRATE_TAX] credit S&H fee.")
+ paying_for_this.bank_card_talk("Goody order size exceeds free shipping limit: Assessing [CRATE_TAX] [MONEY_NAME_SINGULAR] S&H fee.")
else
paying_for_this = SSeconomy.get_dep_account(ACCOUNT_CAR)
if(paying_for_this)
if(!paying_for_this.adjust_money(-price, "Cargo: [spawning_order.pack.name]"))
if(spawning_order.paying_account)
- paying_for_this.bank_card_talk("Cargo order #[spawning_order.id] rejected due to lack of funds. Credits required: [price]")
+ paying_for_this.bank_card_talk("Cargo order #[spawning_order.id] rejected due to lack of funds. [MONEY_NAME_CAPITALIZED] required: [price]")
if(!spawning_order.can_be_cancelled) //only if it absolutly cannot be canceled by the player do we cancel it for them
SSshuttle.shopping_list -= spawning_order
clean_up_orders += spawning_order
@@ -216,7 +216,7 @@ GLOBAL_LIST_INIT(blacklisted_cargo_types, typecacheof(list(
LAZYADD(goodies_by_buyer[spawning_order.paying_account], spawning_order)
var/receiver_message = "Cargo order #[spawning_order.id] has shipped."
if(spawning_order.charge_on_purchase)
- receiver_message += " [price] credits have been charged to your bank account"
+ receiver_message += " [price] [MONEY_NAME] have been charged to your bank account"
paying_for_this.bank_card_talk(receiver_message)
SSeconomy.add_audit_entry(paying_for_this, price, spawning_order.pack.name)
var/datum/bank_account/department/cargo = SSeconomy.get_dep_account(ACCOUNT_CAR)
@@ -275,7 +275,7 @@ GLOBAL_LIST_INIT(blacklisted_cargo_types, typecacheof(list(
qdel(completed_order)
var/datum/bank_account/cargo_budget = SSeconomy.get_dep_account(ACCOUNT_CAR)
- investigate_log("[purchases] orders in this shipment, worth [value] credits. [cargo_budget.account_balance] credits left.", INVESTIGATE_CARGO)
+ investigate_log("[purchases] orders in this shipment, worth [value] [MONEY_NAME]. [cargo_budget.account_balance] [MONEY_NAME] left.", INVESTIGATE_CARGO)
/// Deletes and sells the items on the shuttle
/obj/docking_port/mobile/supply/proc/sell()
@@ -306,7 +306,7 @@ GLOBAL_LIST_INIT(blacklisted_cargo_types, typecacheof(list(
SSshuttle.centcom_message = msg
if(report.exported_atoms.len)
- investigate_log("contents sold for [cargo_budget.account_balance - presale_points] credits. Contents: [report.exported_atoms.Join(",")]. Message: [msg]", INVESTIGATE_CARGO)
+ investigate_log("contents sold for [cargo_budget.account_balance - presale_points] [MONEY_NAME]. Contents: [report.exported_atoms.Join(",")]. Message: [msg]", INVESTIGATE_CARGO)
/*
Generates a box of mail depending on our exports and imports.
diff --git a/code/modules/vending/custom.dm b/code/modules/vending/custom.dm
index 27b760d887c..78a1f811fe9 100644
--- a/code/modules/vending/custom.dm
+++ b/code/modules/vending/custom.dm
@@ -292,10 +292,10 @@
payee.adjust_money(-dispensed_item.custom_price, , "Vending: [dispensed_item]")
linked_account.adjust_money(dispensed_item.custom_price, "Vending: [dispensed_item] Bought")
linked_account.bank_card_talk("[payee.account_holder] made a [dispensed_item.custom_price] \
- cr purchase at your custom vendor.")
+ [MONEY_SYMBOL] purchase at your custom vendor.")
/// Log the transaction
SSblackbox.record_feedback("amount", "vending_spent", dispensed_item.custom_price)
- log_econ("[dispensed_item.custom_price] credits were spent on [src] buying a \
+ log_econ("[dispensed_item.custom_price] [MONEY_NAME] were spent on [src] buying a \
[dispensed_item] by [payee.account_holder], owned by [linked_account.account_holder].")
/// Make an alert
var/ref = REF(user)
diff --git a/code/modules/vending/vendor/_vending.dm b/code/modules/vending/vendor/_vending.dm
index eb27528a0c8..139a50f62e9 100644
--- a/code/modules/vending/vendor/_vending.dm
+++ b/code/modules/vending/vendor/_vending.dm
@@ -330,7 +330,7 @@
return CONTEXTUAL_SCREENTIP_SET
if(panel_open && istype(held_item, refill_canister))
- context[SCREENTIP_CONTEXT_LMB] = "Restock vending machine[credits_contained ? " and collect credits" : null]"
+ context[SCREENTIP_CONTEXT_LMB] = "Restock vending machine[credits_contained ? " and collect [MONEY_NAME]" : null]"
return CONTEXTUAL_SCREENTIP_SET
/**
@@ -370,9 +370,9 @@
else
. += span_notice("\The [src] is fully stocked.")
if(credits_contained < CREDITS_DUMP_THRESHOLD && credits_contained > 0)
- . += span_notice("It should have a handfull of credits stored based on the missing items.")
+ . += span_notice("It should have a handfull of [MONEY_NAME] stored based on the missing items.")
else if (credits_contained > PAYCHECK_CREW)
- . += span_notice("It should have at least a full paycheck worth of credits inside!")
+ . += span_notice("It should have at least a full paycheck worth of [MONEY_NAME] inside!")
/obj/machinery/vending/update_appearance(updates = ALL)
. = ..()
diff --git a/code/modules/vending/vendor/interaction.dm b/code/modules/vending/vendor/interaction.dm
index 38b3be4ea99..3889625f05f 100644
--- a/code/modules/vending/vendor/interaction.dm
+++ b/code/modules/vending/vendor/interaction.dm
@@ -158,7 +158,7 @@
to_chat(user, span_warning("There's nothing to restock!"))
return
- to_chat(user, span_notice("You loaded [restocked] items in [src][credits_contained > 0 ? ", and are rewarded [credits_contained] credits." : "."]"))
+ to_chat(user, span_notice("You loaded [restocked] items in [src][credits_contained > 0 ? ", and are rewarded [credits_contained] [MONEY_NAME]." : "."]"))
var/datum/bank_account/cargo_account = SSeconomy.get_dep_account(ACCOUNT_CAR)
cargo_account.adjust_money(round(credits_contained * 0.5), "Vending: Restock")
var/obj/item/holochip/payday = new(src, credits_contained)
@@ -196,7 +196,7 @@
/obj/machinery/vending/proc/freebie(freebies)
PRIVATE_PROC(TRUE)
- visible_message(span_notice("[src] yields [freebies > 1 ? "several free goodies" : "a free goody"][credits_contained > 0 ? " and some credits" : ""]!"))
+ visible_message(span_notice("[src] yields [freebies > 1 ? "several free goodies" : "a free goody"][credits_contained > 0 ? " and some [MONEY_NAME]" : ""]!"))
for(var/i in 1 to freebies)
playsound(src, 'sound/machines/machine_vend.ogg', 50, TRUE, extrarange = -3)
diff --git a/code/modules/vending/vendor/inventory.dm b/code/modules/vending/vendor/inventory.dm
index ded975a2430..68b028d607b 100644
--- a/code/modules/vending/vendor/inventory.dm
+++ b/code/modules/vending/vendor/inventory.dm
@@ -282,6 +282,6 @@
//transfer money to machine
SSblackbox.record_feedback("amount", "vending_spent", price_to_use)
- log_econ("[price_to_use] credits were inserted into [src] by [account.account_holder] to buy [product_to_vend].")
+ log_econ("[price_to_use] [MONEY_NAME] were inserted into [src] by [account.account_holder] to buy [product_to_vend].")
credits_contained += round(price_to_use * VENDING_CREDITS_COLLECTION_AMOUNT)
return TRUE
diff --git a/code/modules/wiremod/shell/moneybot.dm b/code/modules/wiremod/shell/moneybot.dm
index 7212da886fd..2a6aa015fae 100644
--- a/code/modules/wiremod/shell/moneybot.dm
+++ b/code/modules/wiremod/shell/moneybot.dm
@@ -161,7 +161,7 @@
return
attached_bot.add_money(amount_to_insert)
- balloon_alert(attacker, "inserted [amount_to_insert] credits.")
+ balloon_alert(attacker, "inserted [amount_to_insert] [MONEY_NAME].")
money_input.set_output(amount_to_insert)
entity.set_output(attacker)
money_trigger.set_output(COMPONENT_SIGNAL)