diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 4d32ec2087..a203cd1034 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -15911,7 +15911,7 @@ /turf/open/floor/plasteel, /area/tdome/arena) "IO" = ( -/obj/effect/spawner/structure/window/reinforced, +/obj/effect/spawner/structure/window/plastitanium, /turf/open/floor/plating, /area/slavers) "IP" = ( @@ -16499,6 +16499,10 @@ }, /turf/open/floor/plasteel/freezer, /area/slavers) +"Ke" = ( +/obj/machinery/computer/arcade/tetris, +/turf/open/floor/plasteel, +/area/slavers) "Kf" = ( /obj/effect/turf_decal/stripes/white/line{ dir = 6 @@ -17781,6 +17785,11 @@ /obj/structure/chair/stool, /turf/open/floor/plasteel, /area/slavers) +"NI" = ( +/obj/structure/flora/tree/pine, +/obj/item/disk/nuclear/fake, +/turf/open/floor/plating/asteroid/snow/airless, +/area/slavers) "NJ" = ( /obj/machinery/door/airlock/centcom{ name = "Kitchen"; @@ -18179,11 +18188,13 @@ /area/centcom/holding) "Pq" = ( /obj/structure/rack, +/obj/item/card/id/syndicate/slaver, /obj/item/clothing/suit/straight_jacket, /obj/item/clothing/glasses/sunglasses/blindfold{ pixel_y = 4 }, -/obj/item/card/id/slaver, +/obj/item/card/id/syndicate/slaver, +/obj/item/card/id/syndicate/slaver, /obj/item/clothing/mask/muzzle, /turf/open/floor/plasteel, /area/slavers) @@ -18636,10 +18647,10 @@ /turf/open/floor/holofloor, /area/holodeck/rec_center/basketball) "QY" = ( -/obj/machinery/computer/arcade/battle, /obj/machinery/light{ dir = 1 }, +/obj/machinery/computer/arcade/orion_trail, /turf/open/floor/plasteel, /area/slavers) "QZ" = ( @@ -19491,6 +19502,23 @@ }, /turf/open/floor/wood, /area/centcom/holding) +"UK" = ( +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red, +/obj/machinery/light{ + dir = 4 + }, +/obj/machinery/power/apc{ + cell_type = /obj/item/stock_parts/cell/infinite; + dir = 4; + name = "Slaver Hideout APC"; + pixel_x = 26; + start_charge = 100 + }, +/turf/open/floor/plasteel/dark, +/area/slavers) "UL" = ( /obj/effect/turf_decal/tile/brown, /obj/effect/turf_decal/tile/brown{ @@ -78096,7 +78124,7 @@ Ox Ox Ox Ox -Qc +UK Ox Ox hH @@ -80667,7 +80695,7 @@ BT XI XI Wg -Sm +Im Zm Zm Zm @@ -81181,7 +81209,7 @@ Ud Xn Xn Wg -Sm +Ke Zm Zm Zm @@ -81438,7 +81466,7 @@ sm UM xK Wg -Im +Sm Zm Zm Zm @@ -82740,7 +82768,7 @@ ZD Ol ZD ZD -Ol +NI XS aa aa diff --git a/_maps/shuttles/slaveship_basic.dmm b/_maps/shuttles/slaveship_basic.dmm index e16a4ef5b8..1330c9be26 100644 --- a/_maps/shuttles/slaveship_basic.dmm +++ b/_maps/shuttles/slaveship_basic.dmm @@ -129,12 +129,11 @@ /turf/open/floor/plasteel/dark, /area/shuttle/slaveship) "pj" = ( -/obj/structure/grille, -/obj/structure/window/plastitanium, /obj/machinery/door/poddoor/shutters{ id = "slaveshipshutters"; name = "blast shutters" }, +/obj/effect/spawner/structure/window/plastitanium, /turf/open/floor/plating, /area/shuttle/slaveship) "pl" = ( @@ -396,8 +395,7 @@ /turf/open/floor/plasteel/dark, /area/shuttle/slaveship) "Wk" = ( -/obj/structure/window/plastitanium, -/obj/structure/grille, +/obj/effect/spawner/structure/window/plastitanium, /turf/open/floor/plating, /area/shuttle/slaveship) "WK" = ( @@ -433,6 +431,12 @@ }, /turf/closed/wall/r_wall/syndicate, /area/shuttle/slaveship) +"ZR" = ( +/obj/structure/sign/poster/official/obey{ + pixel_x = -32 + }, +/turf/open/floor/plating, +/area/shuttle/slaveship/brig) "ZZ" = ( /obj/structure/window/reinforced{ dir = 8 @@ -482,7 +486,7 @@ ax ax UL DB -DB +ZR XG XN cy diff --git a/modular_splurt/code/game/gamemodes/objectives.dm b/modular_splurt/code/game/gamemodes/objectives.dm index c3be4a59c2..eafaa5d24c 100644 --- a/modular_splurt/code/game/gamemodes/objectives.dm +++ b/modular_splurt/code/game/gamemodes/objectives.dm @@ -32,5 +32,5 @@ /datum/objective/slaver name = "slave trading" - explanation_text = "Earn 30,000 credits through slave trading." - + explanation_text = "Earn 200,000 credits through slave trading." + diff --git a/modular_splurt/code/game/machinery/computer/slavery.dm b/modular_splurt/code/game/machinery/computer/slavery.dm index 44141fa08f..0aa441999e 100644 --- a/modular_splurt/code/game/machinery/computer/slavery.dm +++ b/modular_splurt/code/game/machinery/computer/slavery.dm @@ -198,7 +198,7 @@ var/area/pod_storage_area = locate(/area/centcom/supplypod/podStorage) in GLOB.sortedAreas var/mob/living/M = collar.loc - priority_announce("[M.real_name] has been returned to the station for [collar.price]cr.", sender_override = "[GLOB.slavers_team_name] Transmission") + priority_announce("[M.real_name] has been returned to the station for [collar.price] credits.", sender_override = "[GLOB.slavers_team_name] Transmission") var/obj/structure/closet/supplypod/centcompod/exportPod = new(pick(get_area_turfs(pod_storage_area))) var/obj/effect/landmark/observer_start/dropzone = locate(/obj/effect/landmark/observer_start) in GLOB.landmarks_list M.forceMove(exportPod) diff --git a/modular_splurt/code/game/mecha/combat/gygax.dm b/modular_splurt/code/game/mecha/combat/gygax.dm new file mode 100644 index 0000000000..c0e6c1b008 --- /dev/null +++ b/modular_splurt/code/game/mecha/combat/gygax.dm @@ -0,0 +1,8 @@ +/obj/mecha/combat/gygax/bluespace + +/obj/mecha/combat/gygax/bluespace/add_cell(obj/item/stock_parts/cell/C=null) + if(C) + C.forceMove(src) + cell = C + return + cell = new /obj/item/stock_parts/cell/bluespace(src) diff --git a/modular_splurt/code/game/object/items/cards_ids.dm b/modular_splurt/code/game/object/items/cards_ids.dm index 77ed3dff4f..04dde78777 100644 --- a/modular_splurt/code/game/object/items/cards_ids.dm +++ b/modular_splurt/code/game/object/items/cards_ids.dm @@ -1,9 +1,8 @@ -/obj/item/card/id/slaver +/obj/item/card/id/syndicate/slaver name = "\improper Slaver Trader ID" desc = "A cheap ID used by slave traders." - icon_state = "retro" - access = list(ACCESS_MAINT_TUNNELS, ACCESS_SLAVER) + access = list(ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_SLAVER) -/obj/item/card/id/slaver/leader +/obj/item/card/id/syndicate/slaver/leader name = "\improper Slaver Master ID" desc = "A cheap ID used by slave traders. This guy seems to run the show." diff --git a/modular_splurt/code/game/object/items/devices/radio/electropack.dm b/modular_splurt/code/game/object/items/devices/radio/electropack.dm index 1eccc097f3..8f5e24e0cb 100644 --- a/modular_splurt/code/game/object/items/devices/radio/electropack.dm +++ b/modular_splurt/code/game/object/items/devices/radio/electropack.dm @@ -40,12 +40,12 @@ /obj/item/electropack/shockcollar/slave/proc/setPrice(newPrice) var/mob/living/M = loc - var/announceMessage = "[M.real_name] has been captured. Send us [newPrice]cr with your communications console to get them back!" + var/announceMessage = "[M.real_name] has been captured. Send us [newPrice] credits with your communications console to get them back!" if (price) // If price has already been set once, we are just changing it if (newPrice > price) // Price has increased - announceMessage = "[M.real_name]'s ransom has increased to [newPrice]cr." + announceMessage = "[M.real_name]'s ransom has increased to [newPrice] credits." else // Price has decreased - announceMessage = "[M.real_name]'s ransom has decreased to [newPrice]cr." + announceMessage = "[M.real_name]'s ransom has decreased to [newPrice] credits." price = newPrice diff --git a/modular_splurt/code/modules/admin/verbs/one_click_antag.dm b/modular_splurt/code/modules/admin/verbs/one_click_antag.dm index 302b1a21ff..5860b138b2 100644 --- a/modular_splurt/code/modules/admin/verbs/one_click_antag.dm +++ b/modular_splurt/code/modules/admin/verbs/one_click_antag.dm @@ -29,13 +29,13 @@ var/datum/team/slavers/slaver_team for(var/mob/c in chosen) var/mob/living/carbon/human/new_character=makeBody(c) - if(!leader_chosen) + if(!leader_chosen && !GLOB.slavers_spawned) // If we have no leader, pick one. Second check means only pick a leader if no previous slaver team has spawned, avoiding multiple leaders. leader_chosen = TRUE new_character.mind.add_antag_datum(/datum/antagonist/slaver/leader) else new_character.mind.add_antag_datum(/datum/antagonist/slaver,slaver_team) - priority_announce("Unidentified ship detected near the station.", "Enemy communication intercepted. Security level elevated.", "intercept") + GLOB.slavers_spawned = TRUE return 1 else return 0 diff --git a/modular_splurt/code/modules/antagonists/slaver/equipment/orderable_gear.dm b/modular_splurt/code/modules/antagonists/slaver/equipment/orderable_gear.dm index ca5338a112..80bec1ec78 100644 --- a/modular_splurt/code/modules/antagonists/slaver/equipment/orderable_gear.dm +++ b/modular_splurt/code/modules/antagonists/slaver/equipment/orderable_gear.dm @@ -59,7 +59,7 @@ GLOBAL_LIST_INIT(slaver_gear, subtypesof(/datum/slaver_gear)) description = "A set of items that contain chameleon technology allowing you to disguise as pretty much anything on the station, and more! \ Due to budget cuts, the shoes don't provide protection against slipping." id = "chameleon" - build_path = /obj/item/storage/box/syndie_kit/chameleon + build_path = /obj/item/storage/box/syndie_kit/chameleon/ghostcafe/generic category = "Slaving" cost = 1000 @@ -69,7 +69,7 @@ GLOBAL_LIST_INIT(slaver_gear, subtypesof(/datum/slaver_gear)) id = "policing" build_path = /obj/item/storage/backpack/duffelbag/syndie/policing_shipment category = "Slaving" - cost = 2000 + cost = 3000 /datum/slaver_gear/slaver_gear name = "Slaver Gear" @@ -77,7 +77,7 @@ GLOBAL_LIST_INIT(slaver_gear, subtypesof(/datum/slaver_gear)) id = "slaver_gear" build_path = /obj/structure/closet/crate/slaver_loadout category = "Slaving" - cost = 750 + cost = 1000 /datum/slaver_gear/x4 name = "X4 charges" @@ -85,7 +85,7 @@ GLOBAL_LIST_INIT(slaver_gear, subtypesof(/datum/slaver_gear)) id = "x4" build_path = /obj/item/storage/box/syndie_kit/x4 category = "Advanced" - cost = 1250 + cost = 2500 /datum/slaver_gear/emag name = "Cryptographic Sequencer" @@ -93,15 +93,7 @@ GLOBAL_LIST_INIT(slaver_gear, subtypesof(/datum/slaver_gear)) id = "emag" build_path = /obj/item/card/emag category = "Advanced" - cost = 3000 - -/datum/slaver_gear/implant_teleport - name = "Emergency Teleport Implants" - description = "Emergency teleport implant x 2." - id = "implant_teleport" - build_path = /obj/item/storage/box/slaver_teleport - category = "Advanced" - cost = 7000 + cost = 6000 /datum/slaver_gear/hardsuits name = "Combat Hardsuits" @@ -109,7 +101,7 @@ GLOBAL_LIST_INIT(slaver_gear, subtypesof(/datum/slaver_gear)) id = "hardsuits" build_path = /obj/item/storage/backpack/duffelbag/syndie/slaver_hardsuits category = "Advanced" - cost = 4500 + cost = 10000 /datum/slaver_gear/riot name = "Riot Kit" @@ -117,7 +109,7 @@ GLOBAL_LIST_INIT(slaver_gear, subtypesof(/datum/slaver_gear)) id = "riot" build_path = /obj/item/storage/backpack/duffelbag/syndie/l6saw_shipment category = "Advanced" - cost = 2000 + cost = 4000 /datum/slaver_gear/medic name = "Medic Kit" @@ -125,7 +117,7 @@ GLOBAL_LIST_INIT(slaver_gear, subtypesof(/datum/slaver_gear)) id = "implant_teleport" build_path = /obj/item/storage/firstaid/tactical/slaver category = "Advanced" - cost = 2500 + cost = 3500 /datum/slaver_gear/chems name = "Bio Kit" @@ -135,7 +127,23 @@ GLOBAL_LIST_INIT(slaver_gear, subtypesof(/datum/slaver_gear)) id = "chems" build_path = /obj/item/storage/backpack/duffelbag/syndie/med/sleeperbundle category = "Advanced" - cost = 2500 + cost = 5500 + +/datum/slaver_gear/disablers + name = "Disablers" + description = "An energy weapon that exhausts organic targets, weakening them until they collapse x 2" + id = "disablers" + build_path = /obj/item/storage/backpack/duffelbag/syndie/disablers + category = "Firearms" + cost = 5000 + +/datum/slaver_gear/energy + name = "Energy Weapons" + description = "A basic hybrid energy gun with two settings: disable and kill x 2" + id = "energy" + build_path = /obj/item/storage/backpack/duffelbag/syndie/energy + category = "Firearms" + cost = 12000 /datum/slaver_gear/smg name = "SMG Kit" @@ -143,7 +151,7 @@ GLOBAL_LIST_INIT(slaver_gear, subtypesof(/datum/slaver_gear)) id = "smg" build_path = /obj/item/storage/backpack/duffelbag/syndie/smg category = "Firearms" - cost = 5000 + cost = 15000 /datum/slaver_gear/smg_rubber name = "SMG Kit (rubber)" @@ -151,7 +159,7 @@ GLOBAL_LIST_INIT(slaver_gear, subtypesof(/datum/slaver_gear)) id = "smg_rubber" build_path = /obj/item/storage/backpack/duffelbag/syndie/smg_rubber category = "Firearms" - cost = 3000 + cost = 10000 /datum/slaver_gear/ion name = "Ion carbines" @@ -159,7 +167,7 @@ GLOBAL_LIST_INIT(slaver_gear, subtypesof(/datum/slaver_gear)) id = "ion" build_path = /obj/item/storage/backpack/duffelbag/syndie/ion category = "Firearms" - cost = 3000 + cost = 7500 /datum/slaver_gear/marksman name = "Marksman Kit" @@ -167,15 +175,39 @@ GLOBAL_LIST_INIT(slaver_gear, subtypesof(/datum/slaver_gear)) id = "marksman" build_path = /obj/item/storage/backpack/duffelbag/syndie/slaver_marksman category = "Firearms" + cost = 40000 + +/datum/slaver_gear/freedom + name = "Freedom Implant" + description = "An implant that instantly releases you from handcuffs." + id = "freedom" + build_path = /obj/item/storage/box/syndie_kit/imp_freedom + category = "Implants" + cost = 4000 + +/datum/slaver_gear/xray + name = "X-Ray Implant" + description = "An implant that lets you see through solid walls." + id = "xray" + build_path = /obj/item/autosurgeon/xray_eyes + category = "Implants" cost = 10000 +/datum/slaver_gear/implant_teleport + name = "Emergency Teleport Implants" + description = "Emergency teleport implant x 2." + id = "implant_teleport" + build_path = /obj/item/storage/box/slaver_teleport + category = "Implants" + cost = 15000 + /datum/slaver_gear/mech name = "Gygax 'Riot-Control' Exosuit" description = "A lightweight, agile mecha. Weapons sold separately." id = "mech" - build_path = /obj/mecha/combat/gygax + build_path = /obj/mecha/combat/gygax/bluespace category = "Mech" - cost = 30000 + cost = 50000 /datum/slaver_gear/mech_taser name = "PBT \"Pacifier\" Mounted Taser" diff --git a/modular_splurt/code/modules/antagonists/slaver/equipment/slaver_items.dm b/modular_splurt/code/modules/antagonists/slaver/equipment/slaver_items.dm index c5f96514b4..dfa8f19ac2 100644 --- a/modular_splurt/code/modules/antagonists/slaver/equipment/slaver_items.dm +++ b/modular_splurt/code/modules/antagonists/slaver/equipment/slaver_items.dm @@ -4,7 +4,7 @@ righthand_file = 'icons/mob/inhands/antag/abductor_righthand.dmi' /obj/item/slaver/gizmo - name = "Collection tool" + name = "\improper collection tool" desc = "A short-range teleportation device. Use on another creature to instantly beam them to your ship." icon_state = "silencer" item_state = "gizmo" @@ -34,7 +34,7 @@ to_chat(user, "The mothership is out of range, you need to be on the same z-level!") return - user.visible_message("[user] begins scanning [M] with \the [src].", "You begin scanning [M] with \the [src].") + user.visible_message("[user] begins scanning [M] with [src].", "You begin scanning [M] with [src].") if(do_mob(user, M, 15 SECONDS)) // Teleport! playsound(get_turf(M.loc), 'sound/magic/blink.ogg', 50, 1) @@ -111,6 +111,20 @@ new /obj/item/clothing/suit/space/hardsuit/syndi(src) new /obj/item/clothing/suit/space/hardsuit/syndi(src) +/obj/item/storage/backpack/duffelbag/syndie/disablers + name = "disablers" + +/obj/item/storage/backpack/duffelbag/syndie/disablers/PopulateContents() + new /obj/item/gun/energy/disabler(src) + new /obj/item/gun/energy/disabler(src) + +/obj/item/storage/backpack/duffelbag/syndie/energy + name = "energy weapons" + +/obj/item/storage/backpack/duffelbag/syndie/energy/PopulateContents() + new /obj/item/gun/energy/e_gun(src) + new /obj/item/gun/energy/e_gun(src) + /obj/item/storage/backpack/duffelbag/syndie/smg_rubber name = "SMG kit (rubber)" @@ -175,3 +189,8 @@ new /obj/item/melee/baton/loaded(src) new /obj/item/storage/box/handcuffs(src) new /obj/item/electrostaff(src) + +// A chameleon kit that anybody can use, with a generic name. +/obj/item/storage/box/syndie_kit/chameleon/ghostcafe/generic + name = "chameleon kit" + desc = "Now you don't have to steal your mom's clothes anymore." diff --git a/modular_splurt/code/modules/antagonists/slaver/equipment/slaver_outfits.dm b/modular_splurt/code/modules/antagonists/slaver/equipment/slaver_outfits.dm index 877a35fb1d..c123e2ca5e 100644 --- a/modular_splurt/code/modules/antagonists/slaver/equipment/slaver_outfits.dm +++ b/modular_splurt/code/modules/antagonists/slaver/equipment/slaver_outfits.dm @@ -6,14 +6,14 @@ gloves = /obj/item/clothing/gloves/color/black back = /obj/item/storage/backpack ears = /obj/item/radio/headset/syndicate - id = /obj/item/card/id/slaver + id = /obj/item/card/id/syndicate/slaver backpack_contents = list(/obj/item/storage/box/survival,\ /obj/item/kitchen/knife/combat/survival) /datum/outfit/slaver/leader name = "Slave Master" - id = /obj/item/card/id/slaver/leader + id = /obj/item/card/id/syndicate/slaver/leader gloves = /obj/item/clothing/gloves/krav_maga/combatglovesplus /datum/outfit/slaver/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE, client/preference_source) diff --git a/modular_splurt/code/modules/antagonists/slaver/slaver.dm b/modular_splurt/code/modules/antagonists/slaver/slaver.dm index 28326a881b..b34977dbf3 100644 --- a/modular_splurt/code/modules/antagonists/slaver/slaver.dm +++ b/modular_splurt/code/modules/antagonists/slaver/slaver.dm @@ -1,4 +1,5 @@ GLOBAL_VAR_INIT(slavers_team_name, "Slave Traders") +GLOBAL_VAR_INIT(slavers_spawned, FALSE) GLOBAL_VAR_INIT(slavers_credits_balance, 4000) GLOBAL_VAR_INIT(slavers_credits_total, 0) GLOBAL_VAR_INIT(slavers_slaves_sold, 0) @@ -122,7 +123,7 @@ GLOBAL_VAR_INIT(slavers_last_announcement, 0) /datum/antagonist/slaver/proc/spawnText() to_chat(owner, "
You are tasked with infiltrating the station and kidnapping members of the crew. Once brought back to the hideout, they can be collared and priced using the console.") to_chat(owner, "The station can choose whether to pay the ransom, and if they do, you can take the slave to the green floor and use the console to 'export' them back, where the ransom will then be paid to your crew to buy new gear. Make sure you give all of the slave's items back before exporting them.") - to_chat(owner, "
Important: This role does NOT mean you can break server rules. Additionally to avoid round removing people, you can only kidnap crew who consent OOC.") + to_chat(owner, "
Important: This role does NOT mean you can break server rules. Additionally to avoid round removing people, you can only kidnap crew who consent OOC or attack you.") to_chat(owner, "You have a special HUD that shows consent for each player at the bottom right of their sprite. A tick means you can kidnap them. A cross means do not. A question mark means ask first.") /datum/antagonist/slaver/leader/proc/slavers_name_assign() @@ -172,10 +173,10 @@ GLOBAL_VAR_INIT(slavers_last_announcement, 0) text += "
" text += "Slaves sold: [slavesSold]
" text += "Slaves not sold: [slavesUnsold]
" - text += "Total money earned: [earnedMoney]cr (needed at least 30,000cr)" + text += "Total money earned: [earnedMoney]cr (needed at least 200,000cr)" // var/datum/objective/slaver/O = locate() in objectives - if(GLOB.slavers_credits_total >= 30000 && !all_dead) + if(GLOB.slavers_credits_total >= 200000 && !all_dead) parts += "The slaver crew were successful!" else parts += "The slaver crew have failed." diff --git a/tgstation.dme b/tgstation.dme index 8c66435c63..bd78d66664 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -4204,6 +4204,7 @@ #include "modular_splurt\code\game\machinery\research_table.dm" #include "modular_splurt\code\game\machinery\computer\slavery.dm" #include "modular_splurt\code\game\machinery\porta_turret\portable_turret.dm" +#include "modular_splurt\code\game\mecha\combat\gygax.dm" #include "modular_splurt\code\game\object\effects\landmarks.dm" #include "modular_splurt\code\game\object\items\cards_ids.dm" #include "modular_splurt\code\game\object\items\cosmetics.dm" diff --git a/tgui/packages/tgui/format.js b/tgui/packages/tgui/format.js index cfefa19cfd..f136b92cdb 100644 --- a/tgui/packages/tgui/format.js +++ b/tgui/packages/tgui/format.js @@ -73,7 +73,7 @@ export const formatPower = (value, minBase1000 = 0) => { return formatSiUnit(value, minBase1000, 'W'); }; -export const formatMoney = (value, precision = 0) => { +export const formatMoney = (value, precision = 0, addCommas = false) => { if (!Number.isFinite(value)) { return value; } @@ -92,8 +92,11 @@ export const formatMoney = (value, precision = 0) => { let result = ''; for (let i = 0; i < length; i++) { if (i > 0 && i < indexOfPoint && (indexOfPoint - i) % 3 === 0) { - // Thin space - result += '\u2009'; + if (addCommas) { + result += '\u002C'; // Comma + } else { + result += '\u2009'; // Thin space + } } result += fixed.charAt(i); } diff --git a/tgui/packages/tgui/interfaces/CommunicationsConsole.js b/tgui/packages/tgui/interfaces/CommunicationsConsole.js index d9db6b7466..090b0a8bc3 100644 --- a/tgui/packages/tgui/interfaces/CommunicationsConsole.js +++ b/tgui/packages/tgui/interfaces/CommunicationsConsole.js @@ -4,6 +4,7 @@ import { useBackend, useLocalState } from "../backend"; import { Blink, Box, Button, Dimmer, Flex, Icon, Input, Modal, Section, TextArea, Table, LabeledList } from "../components"; import { Window } from "../layouts"; import { sanitizeText } from "../sanitize"; +import { formatMoney } from '../format'; const STATE_BUYING_SHUTTLE = "buying_shuttle"; const STATE_CHANGING_STATUS = "changing_status"; @@ -485,7 +486,7 @@ const PageMain = (props, context) => { - {cargocredits}cr + {formatMoney(cargocredits, null, true)}cr @@ -508,8 +509,6 @@ const PageMain = (props, context) => { color="label" textAlign="right"> {slave.toggleransomfeedback} - {/* {slave.bought ? `${slave.cantoggleransom ? - "Ransom paid" : "Ransom paid"}` : ""} */} {