diff --git a/code/game/machinery/computer/orders/order_computer/mining_order.dm b/code/game/machinery/computer/orders/order_computer/mining_order.dm index 527e917fa61..f0d5a917d1a 100644 --- a/code/game/machinery/computer/orders/order_computer/mining_order.dm +++ b/code/game/machinery/computer/orders/order_computer/mining_order.dm @@ -60,7 +60,7 @@ SSshuttle.shopping_list += new_order /obj/machinery/computer/order_console/mining/retrive_points(obj/item/card/id/id_card) - return FLOOR(id_card.registered_account.mining_points, 1) + return round(id_card.registered_account.mining_points) /obj/machinery/computer/order_console/mining/ui_act(action, params) . = ..() diff --git a/code/game/machinery/computer/orders/order_computer/order_computer.dm b/code/game/machinery/computer/orders/order_computer/order_computer.dm index 5e38e354c00..ff4c769bd92 100644 --- a/code/game/machinery/computer/orders/order_computer/order_computer.dm +++ b/code/game/machinery/computer/orders/order_computer/order_computer.dm @@ -77,7 +77,7 @@ GLOBAL_LIST_EMPTY(order_console_products) * card - The ID card we retrive these points from */ /obj/machinery/computer/order_console/proc/retrive_points(obj/item/card/id/id_card) - return FLOOR(id_card.registered_account?.account_balance, 1) + return round(id_card.registered_account?.account_balance) /obj/machinery/computer/order_console/ui_data(mob/user) var/list/data = list() @@ -120,7 +120,7 @@ GLOBAL_LIST_EMPTY(order_console_products) "desc" = item.desc, "cat" = item.category_index, "ref" = REF(item), - "cost" = FLOOR(item.cost_per_order * cargo_cost_multiplier, 1), + "cost" = round(item.cost_per_order * cargo_cost_multiplier), "product_icon" = icon2base64(getFlatIcon(image(icon = initial(item.item_path.icon), icon_state = initial(item.item_path.icon_state)), no_anim=TRUE)) )) return data @@ -209,11 +209,10 @@ GLOBAL_LIST_EMPTY(order_console_products) * returns TRUE if we can afford, FALSE otherwise. */ /obj/machinery/computer/order_console/proc/purchase_items(obj/item/card/id/card, express = FALSE) - var/final_cost = get_total_cost() * (express ? express_cost_multiplier : cargo_cost_multiplier) - var/failure_message = !express ? "Sorry, but you do not have enough [credit_type]." : " Remember, Express upcharges the cost!" + var/final_cost = round(get_total_cost() * (express ? express_cost_multiplier : cargo_cost_multiplier)) if(subtract_points(final_cost, card)) return TRUE - say(failure_message) + say("Sorry, but you do not have enough [credit_type].") return FALSE /** diff --git a/tgui/packages/tgui/interfaces/ProduceConsole.tsx b/tgui/packages/tgui/interfaces/ProduceConsole.tsx index a467beceb55..d6328c9d580 100644 --- a/tgui/packages/tgui/interfaces/ProduceConsole.tsx +++ b/tgui/packages/tgui/interfaces/ProduceConsole.tsx @@ -265,7 +265,7 @@ const CheckoutTab = (props, context) => {
- Total Cost:{total_cargo_cost}(Express: + Total:{total_cargo_cost}(Express: {total_cost * express_cost_multiplier}) {!forced_express && ( @@ -277,7 +277,7 @@ const CheckoutTab = (props, context) => { disabled={total_cargo_cost < cargo_value} tooltip={ total_cargo_cost < cargo_value - ? `Total Cost must be above or equal to ${cargo_value}` + ? `Total must be above or equal to ${cargo_value}` : purchase_tooltip } tooltipPosition="top"