diff --git a/code/datums/cargo.dm b/code/datums/cargo.dm index 31e055de4a6..4766e19d694 100644 --- a/code/datums/cargo.dm +++ b/code/datums/cargo.dm @@ -272,10 +272,10 @@ order_data += "Order Fees:
" order_data += "" return order_data.Join("") diff --git a/code/game/machinery/computer/sentencing.dm b/code/game/machinery/computer/sentencing.dm index 24aa5c3af80..c9e29e36755 100644 --- a/code/game/machinery/computer/sentencing.dm +++ b/code/game/machinery/computer/sentencing.dm @@ -135,7 +135,7 @@ . += "Fine:" . += "" if( incident.fine ) - . += "[incident.fine] Credits" + . += "[incident.fine]电" // . += "" // // . += "" @@ -517,7 +517,7 @@ if( "change_fine" ) if( !incident ) return - var/number = tgui_input_number(usr, "Enter a number between [incident.getMinFine()] and [incident.getMaxFine()] credits.", "Fine", 0, incident.getMaxFine(), incident.getMinFine()) + var/number = tgui_input_number(usr, "Enter a number between [incident.getMinFine()] and [incident.getMaxFine()]电.", "Fine", 0, incident.getMaxFine(), incident.getMinFine()) if( number < incident.getMinFine() ) to_chat(usr, SPAN_ALERT("The entered sentence was less than the minimum sentence!")) else if( number > incident.getMaxFine() ) diff --git a/code/game/machinery/computer/slotmachine.dm b/code/game/machinery/computer/slotmachine.dm index f7b8851e1e2..09c514f61ba 100644 --- a/code/game/machinery/computer/slotmachine.dm +++ b/code/game/machinery/computer/slotmachine.dm @@ -99,7 +99,7 @@ else if(istype(attacking_item, /obj/item/spacecash)) if(paymode == CREDITCHIP) var/obj/item/spacecash/H = attacking_item - to_chat(user, SPAN_NOTICE("You insert [H.worth] credits into [src]'s slot!")) + to_chat(user, SPAN_NOTICE("You insert [H.worth]电 into [src]'s slot!")) playsound(loc, 'sound/arcade/sloto_token.ogg', 10, 1, extrarange = -3, falloff_distance = 10, required_asfx_toggles = ASFX_ARCADE) balance += H.worth updateUsrDialog() diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index ffc30f8492d..da3742e261c 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -590,7 +590,7 @@ BREATH ANALYZER var/value = get_value(target) user.visible_message(SPAN_NOTICE("\The [user] scans \the [target] with \the [src].")) - to_chat(user, SPAN_NOTICE("\The [src] estimates the price of \the [target] at [value ? value : "N/A"].")) + to_chat(user, SPAN_NOTICE("\The [src] estimates the price of \the [target] at [value ? value : "N/A"]电.")) /obj/item/breath_analyzer name = "breath analyzer" diff --git a/code/modules/cargo/bounty.dm b/code/modules/cargo/bounty.dm index a6902bd1b9f..fc5fd1d6960 100644 --- a/code/modules/cargo/bounty.dm +++ b/code/modules/cargo/bounty.dm @@ -31,7 +31,7 @@ // Displayed on bounty UI screen. /datum/bounty/proc/reward_string() - return "[reward] Credits" + return "[reward]电" /datum/bounty/proc/can_claim() return !claimed diff --git a/code/modules/cargo/export_scanner.dm b/code/modules/cargo/export_scanner.dm index 751253eac0f..aa6423b225e 100644 --- a/code/modules/cargo/export_scanner.dm +++ b/code/modules/cargo/export_scanner.dm @@ -15,7 +15,7 @@ var/price = SScargo.export_item_and_contents(O, FALSE, FALSE, dry_run=TRUE) if(price) - to_chat(user, SPAN_NOTICE("Scanned [O], value: [price] credits[O.contents.len ? " (contents included)" : ""].")) + to_chat(user, SPAN_NOTICE("Scanned [O], value: [price]电[O.contents.len ? " (contents included)" : ""].")) else to_chat(user, SPAN_WARNING("Scanned [O], no export value.")) if(SScargo.bounty_ship_item_and_contents(O, dry_run=TRUE)) diff --git a/code/modules/cargo/exports.dm b/code/modules/cargo/exports.dm index 26893c0fb5a..00cee153ac8 100644 --- a/code/modules/cargo/exports.dm +++ b/code/modules/cargo/exports.dm @@ -132,7 +132,7 @@ then the player gets the profit from selling his own wasted time. /datum/export/proc/total_printout(contr = 0, emag = 0) if(!total_cost && !total_amount) return "" - var/msg = "[total_cost] credits: Received [total_amount] " + var/msg = "[total_cost]电: Received [total_amount]电 " if(total_cost > 0) msg = "+" + msg diff --git a/code/modules/client/preference_setup/other/01_incidents.dm b/code/modules/client/preference_setup/other/01_incidents.dm index af4a62a892a..b152305bac1 100644 --- a/code/modules/client/preference_setup/other/01_incidents.dm +++ b/code/modules/client/preference_setup/other/01_incidents.dm @@ -78,7 +78,7 @@ if (I.fine == 0) dat += "
Brig Sentence: [I.getBrigSentence()]
" else - dat += "Fine: [I.fine] Credits
" + dat += "Fine: [I.fine]电
" dat += "Notes:
" if (I.notes != "") dat += nl2br(I.notes) diff --git a/code/modules/cooking/machinery/commissary.dm b/code/modules/cooking/machinery/commissary.dm index 082632a5839..a1733310c6d 100644 --- a/code/modules/cooking/machinery/commissary.dm +++ b/code/modules/cooking/machinery/commissary.dm @@ -177,7 +177,7 @@ return I = user.GetIdCard() if(istype(I) && (ACCESS_CARGO in I.access)) - var/price_guess = text2num(sanitizeSafe( tgui_input_text(user, "How much do you wish to withdraw? Remaining cash: [credit]", "QuikPay", 0, 10), 10)) + var/price_guess = text2num(sanitizeSafe( tgui_input_text(user, "How much do you wish to withdraw? Remaining credits: [credit]电", "QuikPay", 0, 10), 10)) if(isnull(price_guess) || price_guess == 0) return price_guess = max(0, round(price_guess, 0.01)) @@ -375,10 +375,10 @@ var/item_amount = bought_item["amount"] var/item_price = items_to_price[item_name] - receipt += "
  • [item_name]: [item_amount] x [item_price]cr: [item_amount * item_price]cr
    " + receipt += "
  • [item_name]: [item_amount] x [item_price]电: [item_amount * item_price]电
    " sum += item_price * item_amount - receipt += "
    Total: [sum]cr
    " + receipt += "
    Total: [sum]电
    " playsound(src, 'sound/machines/ping.ogg', 25, 1) audible_message(SPAN_NOTICE("[icon2html(src, viewers(get_turf(src)))] \The [src] pings.")) . = TRUE diff --git a/code/modules/economy/OrderTerminal.dm b/code/modules/economy/OrderTerminal.dm index 035ad232ab2..a7e3ce019d0 100644 --- a/code/modules/economy/OrderTerminal.dm +++ b/code/modules/economy/OrderTerminal.dm @@ -180,8 +180,8 @@ var/item_price = items_to_price[item_name] sum += item_price - receipt += "[name]: [item_name] x[item_amount] at [item_price]cr each
    " - ticket += "[name]: [item_name] x[item_amount] at [item_price]cr each
    " + receipt += "[name]: [item_name] x[item_amount] at [item_price]电 each
    " + ticket += "[name]: [item_name] x[item_amount] at [item_price]电 each
    " receipt += "
    Total: [sum]电" ticket += "
    Total: [sum]电" sum = sum diff --git a/code/modules/economy/cash.dm b/code/modules/economy/cash.dm index b57dcbb8513..3348dded99f 100644 --- a/code/modules/economy/cash.dm +++ b/code/modules/economy/cash.dm @@ -1,6 +1,6 @@ /obj/item/spacecash name = "0 credit chip" - desc = "It's worth 0 credits." + desc = "It's worth 0电." gender = PLURAL icon = 'icons/obj/cash.dmi' icon_state = "spacecash1" @@ -38,7 +38,7 @@ h_user.drop_from_inventory(src) h_user.drop_from_inventory(bundle) h_user.put_in_hands(bundle) - to_chat(user, SPAN_NOTICE("You add [src.worth] credits worth of money to the bundles.
    It holds [bundle.worth] credits now.")) + to_chat(user, SPAN_NOTICE("You add [src.worth]电 to the bundles.
    It holds [bundle.worth]电 now.")) qdel(src) /proc/coin_typepath_suffix(var/amount) @@ -55,7 +55,7 @@ name = "credit chips" icon_state = "" gender = PLURAL - desc = "They are worth 0 credits." + desc = "They are worth 0电." worth = 0 /obj/item/spacecash/bundle/update_icon() @@ -97,7 +97,7 @@ AddOverlays(ovr) UpdateOverlays() // The delay looks weird, so we force an update immediately. - src.desc = "A bundle of Biesel Standard Credits. Combined, this is worth [worth] credits." + src.desc = "A bundle of Biesel Standard Credits. Combined, this is worth [worth]电." /obj/item/spacecash/bundle/attack_self(mob/user as mob) var/amount = tgui_input_number(user, "How many credits do you want to take out? (0 to [src.worth])", "Take Money", 5, worth, 0, 0, round_value = FALSE) @@ -171,49 +171,49 @@ /obj/item/spacecash/c5 name = "5 credit chip" icon_state = "spacecash5" - desc = "A Biesel Standard Credit chip, used for transactions large and small. This one is worth 5 credits." + desc = "A Biesel Standard Credit chip, used for transactions large and small. This one is worth 5电." worth = 5 /obj/item/spacecash/c10 name = "10 credit chip" icon_state = "spacecash10" - desc = "A Biesel Standard Credit chip, used for transactions large and small. This one is worth 10 credits." + desc = "A Biesel Standard Credit chip, used for transactions large and small. This one is worth 10电." worth = 10 /obj/item/spacecash/c20 name = "20 credit chip" icon_state = "spacecash20" - desc = "A Biesel Standard Credit chip, used for transactions large and small. This one is worth 20 credits." + desc = "A Biesel Standard Credit chip, used for transactions large and small. This one is worth 20电." worth = 20 /obj/item/spacecash/c50 name = "50 credit chip" icon_state = "spacecash50" - desc = "A Biesel Standard Credit chip, used for transactions large and small. This one is worth 50 credits." + desc = "A Biesel Standard Credit chip, used for transactions large and small. This one is worth 50电." worth = 50 /obj/item/spacecash/c100 name = "100 credit chip" icon_state = "spacecash100" - desc = "A Biesel Standard Credit chip, used for transactions large and small. This one is worth 100 credits." + desc = "A Biesel Standard Credit chip, used for transactions large and small. This one is worth 100电." worth = 100 /obj/item/spacecash/c200 name = "200 credit chip" icon_state = "spacecash200" - desc = "A Biesel Standard Credit chip, used for transactions large and small. This one is worth 200 credits." + desc = "A Biesel Standard Credit chip, used for transactions large and small. This one is worth 200电." worth = 200 /obj/item/spacecash/c500 name = "500 credit chip" icon_state = "spacecash500" - desc = "A Biesel Standard Credit chip, used for transactions large and small. This one is worth 500 credits." + desc = "A Biesel Standard Credit chip, used for transactions large and small. This one is worth 500电." worth = 500 /obj/item/spacecash/c1000 name = "1000 credit chip" icon_state = "spacecash1000" - desc = "A Biesel Standard Credit chip, used for transactions large and small. This one is worth 1000 credits." + desc = "A Biesel Standard Credit chip, used for transactions large and small. This one is worth 1000电." worth = 1000 /obj/item/spacecash/coin @@ -238,25 +238,25 @@ /obj/item/spacecash/coin/c001 name = "1 cent unie coin" icon_state = "spacecash0.01" - desc = "A Biesel Standard Credit coin, called a 'unie'. This is worth 0.01 credits." + desc = "A Biesel Standard Credit coin, called a 'unie'. This is worth 0.01电." worth = 0.01 /obj/item/spacecash/coin/c005 name = "5 cent quin coin" icon_state = "spacecash0.05" - desc = "A Biesel Standard Credit coin, called a 'quin'. This is worth 0.05 credits." + desc = "A Biesel Standard Credit coin, called a 'quin'. This is worth 0.05电." worth = 0.05 /obj/item/spacecash/coin/c010 name = "10 cent dece coin" icon_state = "spacecash0.10" - desc = "A Biesel Standard Credit coin, called a 'dece'. This is worth 0.10 credits." + desc = "A Biesel Standard Credit coin, called a 'dece'. This is worth 0.10电." worth = 0.10 /obj/item/spacecash/coin/c025 name = "25 cent quarter coin" icon_state = "spacecash0.25" - desc = "A Biesel Standard Credit coin, called a 'quarter'. This is worth 0.25 credits." + desc = "A Biesel Standard Credit coin, called a 'quarter'. This is worth 0.25电." worth = 0.25 /proc/spawn_money(var/sum, spawnloc, mob/living/carbon/human/human_user as mob) diff --git a/code/modules/economy/quikpay.dm b/code/modules/economy/quikpay.dm index f7ffe3d7ae2..3ddeffa6615 100644 --- a/code/modules/economy/quikpay.dm +++ b/code/modules/economy/quikpay.dm @@ -203,10 +203,10 @@ var/item_amount = bought_item["amount"] var/item_price = items_to_price[item_name] - receipt += "
  • [item_name]: [item_amount] x [item_price]cr: [item_amount * item_price]cr
    " + receipt += "
  • [item_name]: [item_amount] x [item_price]电: [item_amount * item_price]电
    " sum += item_price * item_amount - receipt += "
    Total: [sum]cr
    " + receipt += "
    Total: [sum]电
    " playsound(src, 'sound/machines/ping.ogg', 25, 1) audible_message(SPAN_NOTICE("[icon2html(src, viewers(get_turf(src)))] \The [src] pings.")) . = TRUE @@ -259,5 +259,6 @@ price_guess = max(0, round(price_guess, 0.01)) items += list(list("name" = "[name_guess]", "price" = price_guess)) + items_to_price[name_guess] = price_guess to_chat(user, SPAN_NOTICE("[src]: added '[name_guess]' for [price_guess].")) diff --git a/code/modules/events/money_lotto.dm b/code/modules/events/money_lotto.dm index 3454f0c7b0e..071c123763f 100644 --- a/code/modules/events/money_lotto.dm +++ b/code/modules/events/money_lotto.dm @@ -28,8 +28,8 @@ var/author = "[SSatlas.current_map.company_name] Editor" var/channel = "Tau Ceti Daily" - var/body = "Tau Ceti Daily wishes to congratulate [winner_name] for recieving the Tau Ceti Stellar Slam Lottery, and receiving the out of this world sum of [winner_sum] credits!" + var/body = "Tau Ceti Daily wishes to congratulate [winner_name] for recieving the Tau Ceti Stellar Slam Lottery, and receiving the out of this world sum of [winner_sum]电!" if(!deposit_success) - body += "
    Unfortunately, we were unable to verify the account details provided, so we were unable to transfer the money. Send a cheque containing the sum of 5000 credits to ND 'Stellar Slam' office on the Tau Ceti gateway containing updated details, and your winnings'll be re-sent within the month." + body += "
    Unfortunately, we were unable to verify the account details provided, so we were unable to transfer the money. Send a cheque containing the sum of 5000电 to ND 'Stellar Slam' office on the Tau Ceti gateway containing updated details, and your winnings'll be re-sent within the month." var/datum/feed_channel/ch = SSnews.GetFeedChannel(channel) SSnews.SubmitArticle(body, author, ch, null, 1) diff --git a/code/modules/law/incident.dm b/code/modules/law/incident.dm index 5d2ae9f4c93..754b9db0543 100644 --- a/code/modules/law/incident.dm +++ b/code/modules/law/incident.dm @@ -171,7 +171,7 @@ else . += "\tBRIG: [brig_sentence] minutes
    " else if ( fine != 0 ) - . += "As decided by the arbiter(s), they have been fined [fine] credits.
    " + . += "As decided by the arbiter(s), they have been fined [fine]电.
    " else . += "As decided by the arbiter(s), they will serve no time for their crimes.
    " . += "
    " diff --git a/code/modules/paperwork/folders.dm b/code/modules/paperwork/folders.dm index a4f4f1d5614..76d8809c363 100644 --- a/code/modules/paperwork/folders.dm +++ b/code/modules/paperwork/folders.dm @@ -84,7 +84,7 @@ if(!istype(paper) || paper.loc != src) return var/obj/item/pen = usr.get_inactive_hand() - if(!pen || !pen.tool_behaviour == TOOL_PEN) + if(!pen || pen.tool_behaviour != TOOL_PEN) pen = usr.get_active_hand() if(pen?.tool_behaviour == TOOL_PEN) paper.attackby(pen, usr) diff --git a/html/changelogs/ThreeForOneBugfix.yml b/html/changelogs/ThreeForOneBugfix.yml new file mode 100644 index 00000000000..53edc6a3f24 --- /dev/null +++ b/html/changelogs/ThreeForOneBugfix.yml @@ -0,0 +1,8 @@ +author: TheGreyWolf + +delete-after: True + +changes: + - bugfix: "Fixed that journals and notepads could not be written in when held in hand." + - bugfix: "Fixed the quik-pay not getting prices correct when clicking an item with it to input it quickly." + - spellcheck: "Standardised how the credit symbol is shown in several places, and replaces several instances of credits with the symbol." diff --git a/tgui/packages/tgui/interfaces/CargoControl.tsx b/tgui/packages/tgui/interfaces/CargoControl.tsx index 12b590eff81..694b53f3fb1 100644 --- a/tgui/packages/tgui/interfaces/CargoControl.tsx +++ b/tgui/packages/tgui/interfaces/CargoControl.tsx @@ -208,16 +208,16 @@ export const CargoControl = (props, context) => { : 'Unauthorised'} - {data.order_details.price.toFixed(2)} 电 + {data.order_details.price.toFixed(2)}电 - {data.order_details.price_cargo.toFixed(2)} 电 + {data.order_details.price_cargo.toFixed(2)}电 - {data.order_details.price_customer.toFixed(2)} 电 + {data.order_details.price_customer.toFixed(2)}电 - {data.order_details.price_customer.toFixed(2)} 电 + {data.order_details.price_customer.toFixed(2)}电 {data.order_details.time_submitted} @@ -255,7 +255,7 @@ export const CargoControl = (props, context) => { {item.name} {item.supplier_name} - {item.price.toFixed(2)} 电 + {item.price.toFixed(2)}电 ))}
    @@ -296,7 +296,7 @@ export const MainWindow = (props, context) => { Welcome, {data.username}. - {data.cargo_money.toFixed(2)} 电 + {data.cargo_money.toFixed(2)}电 {data.shuttle_has_arrive_time ? ( @@ -329,7 +329,7 @@ export const OverviewSubmitted = (props, context) => { {data.order_approved_shuttle_time / 10} seconds - {data.order_approved_shuttle_price.toFixed(2)} 电 + {data.order_approved_shuttle_price.toFixed(2)}电 @@ -343,7 +343,7 @@ export const OverviewSubmitted = (props, context) => { {order.order_id} {order.ordered_by} - {order.price_cargo.toFixed(2)} 电 + {order.price_cargo.toFixed(2)}电
    @@ -416,7 +416,7 @@ export const OverviewApproved = (props, context) => { {order.order_id} {order.ordered_by} - {order.price_cargo.toFixed(2)} 电 + {order.price_cargo.toFixed(2)}电
    @@ -252,7 +252,7 @@ export const Payment = (props, context) => { > - {data.order_details.price_customer.toFixed(2)} 电 + {data.order_details.price_customer.toFixed(2)}电 {data.paying_account} diff --git a/tgui/packages/tgui/interfaces/CargoOrder.tsx b/tgui/packages/tgui/interfaces/CargoOrder.tsx index 69b6926ccde..c5ac1271775 100644 --- a/tgui/packages/tgui/interfaces/CargoOrder.tsx +++ b/tgui/packages/tgui/interfaces/CargoOrder.tsx @@ -143,7 +143,7 @@ export const MainPage = (props, context) => { {data.order_item_count} - {data.order_value.toFixed(2)} 电 + {data.order_value.toFixed(2)}电 {data.status_message && ( @@ -272,16 +272,16 @@ export const ShowDetails = (props, context) => { Handling Fee - {data.handling_fee.toFixed(2)} 电 + {data.handling_fee.toFixed(2)}电 Crate Fee - {data.crate_fee.toFixed(2)} 电 + {data.crate_fee.toFixed(2)}电 {data.order_items.map((item) => ( {item.name} - {item.price.toFixed(2)} 电 + {item.price.toFixed(2)}电 ))}