From 53719bded3badfe50c48e0bf7a5ba5c424bc5a80 Mon Sep 17 00:00:00 2001 From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Date: Tue, 6 Aug 2024 06:59:37 -0400 Subject: [PATCH] better examine text for radiation collectors (#30606) * better examine text for radiation collectors * this? * penis --- .../EntitySystems/RadiationCollectorSystem.cs | 19 ++++++++++++++----- .../power/components/radiation-collector.ftl | 13 +++++++++++-- 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/Content.Server/Singularity/EntitySystems/RadiationCollectorSystem.cs b/Content.Server/Singularity/EntitySystems/RadiationCollectorSystem.cs index 9107ff2e32..c262988c86 100644 --- a/Content.Server/Singularity/EntitySystems/RadiationCollectorSystem.cs +++ b/Content.Server/Singularity/EntitySystems/RadiationCollectorSystem.cs @@ -137,13 +137,22 @@ public sealed class RadiationCollectorSystem : EntitySystem private void OnExamined(EntityUid uid, RadiationCollectorComponent component, ExaminedEvent args) { - if (!TryGetLoadedGasTank(uid, out var gasTank)) + using (args.PushGroup(nameof(RadiationCollectorComponent))) { - args.PushMarkup(Loc.GetString("power-radiation-collector-gas-tank-missing")); - return; - } + args.PushMarkup(Loc.GetString("power-radiation-collector-enabled", ("state", component.Enabled))); + + if (!TryGetLoadedGasTank(uid, out var gasTank)) + { + args.PushMarkup(Loc.GetString("power-radiation-collector-gas-tank-missing")); + } + else + { + _appearance.TryGetData(uid, RadiationCollectorVisuals.PressureState, out var state); - args.PushMarkup(Loc.GetString("power-radiation-collector-gas-tank-present")); + args.PushMarkup(Loc.GetString("power-radiation-collector-gas-tank-present", + ("fullness", state))); + } + } } private void OnAnalyzed(EntityUid uid, RadiationCollectorComponent component, GasAnalyzerScanEvent args) diff --git a/Resources/Locale/en-US/power/components/radiation-collector.ftl b/Resources/Locale/en-US/power/components/radiation-collector.ftl index c38050f1e0..199b3789ae 100644 --- a/Resources/Locale/en-US/power/components/radiation-collector.ftl +++ b/Resources/Locale/en-US/power/components/radiation-collector.ftl @@ -1,2 +1,11 @@ -power-radiation-collector-gas-tank-missing = [color=darkred]No plasma tank attached.[/color] -power-radiation-collector-gas-tank-present = A plasma tank is [color=darkgreen]connected[/color]. \ No newline at end of file +power-radiation-collector-gas-tank-missing = The plasma tank slot is [color=darkred]empty[/color]. +power-radiation-collector-gas-tank-present = The plasma tank slot is [color=darkgreen]filled[/color] and the tank indicator reads [color={$fullness -> + *[0]red]empty + [1]red]low + [2]yellow]half-full + [3]lime]full +}[/color]. +power-radiation-collector-enabled = It's switched [color={$state -> + [true] darkgreen]on + *[false] darkred]off +}[/color]. -- 2.52.0