From e5974183680964f5e50bfbcb26fca49460e5bb6b Mon Sep 17 00:00:00 2001
From: Dvir <dvirf01@gmail.com>
Date: Sun, 15 Oct 2023 03:26:40 +0300
Subject: [PATCH 1/4] Shipyard show sell price

---
 .../BUI/ShipyardConsoleBoundUserInterface.cs  |  3 ++
 .../Shipyard/UI/ShipyardConsoleMenu.xaml      |  1 +
 .../Shipyard/UI/ShipyardConsoleMenu.xaml.cs   |  9 +++-
 .../Systems/ShipyardSystem.Consoles.cs        | 46 +++++++++++++++----
 .../BUI/ShipyardConsoleInterfaceState.cs      |  6 +++
 .../en-US/cargo/cargo-console-component.ftl   |  2 +
 6 files changed, 57 insertions(+), 10 deletions(-)

diff --git a/Content.Client/Shipyard/BUI/ShipyardConsoleBoundUserInterface.cs b/Content.Client/Shipyard/BUI/ShipyardConsoleBoundUserInterface.cs
index 4401bdd4163..d1703159a70 100644
--- a/Content.Client/Shipyard/BUI/ShipyardConsoleBoundUserInterface.cs
+++ b/Content.Client/Shipyard/BUI/ShipyardConsoleBoundUserInterface.cs
@@ -15,6 +15,8 @@ public sealed class ShipyardConsoleBoundUserInterface : BoundUserInterface
     private ShipyardRulesPopup? _rulesWindow;
     public int Balance { get; private set; }
 
+    public int? ShipSellValue { get; private set; }
+
     public ShipyardConsoleBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
     {
     }
@@ -57,6 +59,7 @@ protected override void UpdateState(BoundUserInterfaceState state)
             return;
 
         Balance = cState.Balance;
+        ShipSellValue = cState.ShipSellValue;
         var castState = (ShipyardConsoleInterfaceState) state;
         Populate(castState.UiKey);
         _menu?.UpdateState(castState);
diff --git a/Content.Client/Shipyard/UI/ShipyardConsoleMenu.xaml b/Content.Client/Shipyard/UI/ShipyardConsoleMenu.xaml
index 56d012872f6..16dad360d4f 100644
--- a/Content.Client/Shipyard/UI/ShipyardConsoleMenu.xaml
+++ b/Content.Client/Shipyard/UI/ShipyardConsoleMenu.xaml
@@ -5,6 +5,7 @@
                            MinSize="460 280">
     <BoxContainer Orientation="Vertical" Margin="5 0 5 0">
         <Label Name="BankAccountLabel" />
+        <Label Name="ShipSellValueLabel" />
         <BoxContainer Orientation="Horizontal">
             <OptionButton Name="Categories"
                           Prefix="{Loc 'cargo-console-menu-categories-label'}"
diff --git a/Content.Client/Shipyard/UI/ShipyardConsoleMenu.xaml.cs b/Content.Client/Shipyard/UI/ShipyardConsoleMenu.xaml.cs
index 89a199dac08..bb1dd8c68ea 100644
--- a/Content.Client/Shipyard/UI/ShipyardConsoleMenu.xaml.cs
+++ b/Content.Client/Shipyard/UI/ShipyardConsoleMenu.xaml.cs
@@ -134,7 +134,14 @@ public void PopulateCategories()
 
     public void UpdateState(ShipyardConsoleInterfaceState state)
     {
-        BankAccountLabel.Text = Loc.GetString("cargo-console-menu-points-amount", ("amount", state.Balance.ToString()));
+        if (state.ShipSellTax != 0.0f)
+        {
+            var tax = (int) (state.ShipSellValue * state.ShipSellTax);
+            state.ShipSellValue -= tax;
+        }
+
+        BankAccountLabel.Text = Loc.GetString("cargo-shuttle-console-bank-amount", ("amount", state.Balance.ToString()));
+        ShipSellValueLabel.Text = Loc.GetString("cargo-shuttle-console-sell-value", ("value", state.ShipSellValue.ToString()));
         SellShipButton.Disabled = state.ShipDeedTitle == null;
         TargetIdButton.Text = state.IsTargetIdPresent
             ? Loc.GetString("id-card-console-window-eject-button")
diff --git a/Content.Server/Shipyard/Systems/ShipyardSystem.Consoles.cs b/Content.Server/Shipyard/Systems/ShipyardSystem.Consoles.cs
index e85887cda39..2eaafb563c3 100644
--- a/Content.Server/Shipyard/Systems/ShipyardSystem.Consoles.cs
+++ b/Content.Server/Shipyard/Systems/ShipyardSystem.Consoles.cs
@@ -26,6 +26,8 @@
 using Content.Server.Chat.Systems;
 using Content.Server.StationRecords.Systems;
 using Content.Shared.Database;
+using Content.Server.Shuttles.Components;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
 
 namespace Content.Server.Shipyard.Systems;
 
@@ -168,7 +170,8 @@ private void OnPurchaseMessage(EntityUid uid, ShipyardConsoleComponent component
         var channel = _prototypeManager.Index<RadioChannelPrototype>(component.ShipyardChannel);
         newDeed.ShuttleUid = shuttle.Owner;
         newDeed.ShuttleName = name;
-        _idSystem.TryChangeJobTitle(targetId, $"Captain", idCard, player);
+        if (ShipyardConsoleUiKey.Security != (ShipyardConsoleUiKey) args.UiKey)
+            _idSystem.TryChangeJobTitle(targetId, $"Captain", idCard, player);
         _radio.SendRadioMessage(uid, Loc.GetString("shipyard-console-docking", ("vessel", name)), channel, uid);
         _chat.TrySendInGameICMessage(uid, Loc.GetString("shipyard-console-docking", ("vessel", name)), InGameICChatType.Speak, true);
 
@@ -183,9 +186,17 @@ private void OnPurchaseMessage(EntityUid uid, ShipyardConsoleComponent component
             _records.Synchronize(station);
         }
 
+        float shipSellTax = 0.0f;
+        if (ShipyardConsoleUiKey.BlackMarket == (ShipyardConsoleUiKey) args.UiKey)
+            shipSellTax = 0.30f;
+
+        int sellValue = 0;
+        if (TryComp<ShuttleDeedComponent>(targetId, out var deed))
+            sellValue = (int) _pricing.AppraiseGrid((EntityUid) (deed?.ShuttleUid!));
+
         PlayConfirmSound(uid, component);
         _adminLogger.Add(LogType.ShipYardUsage, LogImpact.Low, $"{ToPrettyString(player):actor} purchased shuttle {ToPrettyString(shuttle.Owner)} for {vessel.Price} credits via {ToPrettyString(component.Owner)}");
-        RefreshState(uid, bank.Balance, true, name, true, (ShipyardConsoleUiKey) args.UiKey);
+        RefreshState(uid, bank.Balance, true, name, sellValue, shipSellTax, true, (ShipyardConsoleUiKey) args.UiKey);
     }
 
     public void OnSellMessage(EntityUid uid, ShipyardConsoleComponent component, ShipyardConsoleSellMessage args)
@@ -253,6 +264,7 @@ public void OnSellMessage(EntityUid uid, ShipyardConsoleComponent component, Shi
 
         RemComp<ShuttleDeedComponent>(targetId);
 
+        float shipSellTax = 0.0f;
         if (ShipyardConsoleUiKey.BlackMarket == (ShipyardConsoleUiKey) args.UiKey)
         {
             var tax = (int) (bill * 0.30f);
@@ -264,12 +276,13 @@ public void OnSellMessage(EntityUid uid, ShipyardConsoleComponent component, Shi
             }
 
             bill -= tax;
+            shipSellTax = 0.30f;
         }
 
         _bank.TryBankDeposit(player, bill);
         PlayConfirmSound(uid, component);
         _adminLogger.Add(LogType.ShipYardUsage, LogImpact.Low, $"{ToPrettyString(player):actor} sold {shuttleName} for {bill} credits via {ToPrettyString(component.Owner)}");
-        RefreshState(uid, bank.Balance, true, null, true, (ShipyardConsoleUiKey) args.UiKey);
+        RefreshState(uid, bank.Balance, true, null, 0, shipSellTax, true, (ShipyardConsoleUiKey) args.UiKey);
     }
 
     private void OnConsoleUIOpened(EntityUid uid, ShipyardConsoleComponent component, BoundUIOpenedEvent args)
@@ -286,11 +299,17 @@ private void OnConsoleUIOpened(EntityUid uid, ShipyardConsoleComponent component
         {
             return;
         }
-        var targetId = component.TargetIdSlot.ContainerSlot?.ContainedEntity;
 
-        TryComp<ShuttleDeedComponent>(targetId, out var deed);
+        float shipSellTax = 0.0f;
+        if (ShipyardConsoleUiKey.BlackMarket == (ShipyardConsoleUiKey) args.UiKey)
+            shipSellTax = 0.30f;
 
-        RefreshState(uid, bank.Balance, true, deed?.ShuttleName, targetId.HasValue, (ShipyardConsoleUiKey) args.UiKey);
+        var targetId = component.TargetIdSlot.ContainerSlot?.ContainedEntity;
+        int sellValue = 0;
+        if (TryComp<ShuttleDeedComponent>(targetId, out var deed))
+            sellValue = (int) _pricing.AppraiseGrid((EntityUid) (deed?.ShuttleUid!));
+
+        RefreshState(uid, bank.Balance, true, deed?.ShuttleName, sellValue, shipSellTax, targetId.HasValue, (ShipyardConsoleUiKey) args.UiKey);
     }
 
     private void ConsolePopup(ICommonSession session, string text)
@@ -329,9 +348,16 @@ private void OnItemSlotChanged(EntityUid uid, ShipyardConsoleComponent component
             return;
         }
 
+        float shipSellTax = 0.0f;
+        if (ShipyardConsoleUiKey.BlackMarket == (ShipyardConsoleUiKey) uiComp.Key)
+            shipSellTax = 0.30f;
+
         var targetId = component.TargetIdSlot.ContainerSlot?.ContainedEntity;
-        TryComp<ShuttleDeedComponent>(targetId, out var deed);
-        RefreshState(uid, bank.Balance, true, deed?.ShuttleName, targetId.HasValue, (ShipyardConsoleUiKey) uiComp.Key);
+        int sellValue = 0;
+        if (TryComp<ShuttleDeedComponent>(targetId, out var deed))
+            sellValue = (int) _pricing.AppraiseGrid((EntityUid) (deed?.ShuttleUid!));
+
+        RefreshState(uid, bank.Balance, true, deed?.ShuttleName, sellValue, shipSellTax, targetId.HasValue, (ShipyardConsoleUiKey) uiComp.Key);
     }
 
     public bool FoundOrganics(EntityUid uid, EntityQuery<MobStateComponent> mobQuery, EntityQuery<TransformComponent> xformQuery)
@@ -348,12 +374,14 @@ public bool FoundOrganics(EntityUid uid, EntityQuery<MobStateComponent> mobQuery
         return false;
     }
 
-    private void RefreshState(EntityUid uid, int balance, bool access, string? shipDeed, bool isTargetIdPresent, ShipyardConsoleUiKey uiKey)
+    private void RefreshState(EntityUid uid, int balance, bool access, string? shipDeed, int shipSellValue, float shipSellTax, bool isTargetIdPresent, ShipyardConsoleUiKey uiKey)
     {
         var newState = new ShipyardConsoleInterfaceState(
             balance,
             access,
             shipDeed,
+            shipSellValue,
+            shipSellTax,
             isTargetIdPresent,
             ((byte)uiKey));
 
diff --git a/Content.Shared/Shipyard/BUI/ShipyardConsoleInterfaceState.cs b/Content.Shared/Shipyard/BUI/ShipyardConsoleInterfaceState.cs
index 3a77389c5c9..ec251822fd1 100644
--- a/Content.Shared/Shipyard/BUI/ShipyardConsoleInterfaceState.cs
+++ b/Content.Shared/Shipyard/BUI/ShipyardConsoleInterfaceState.cs
@@ -8,6 +8,8 @@ public sealed class ShipyardConsoleInterfaceState : BoundUserInterfaceState
     public int Balance;
     public readonly bool AccessGranted;
     public readonly string? ShipDeedTitle;
+    public int ShipSellValue;
+    public float ShipSellTax;
     public readonly bool IsTargetIdPresent;
     public readonly byte UiKey;
 
@@ -15,12 +17,16 @@ public ShipyardConsoleInterfaceState(
         int balance,
         bool accessGranted,
         string? shipDeedTitle,
+        int shipSellValue,
+        float shipSellTax,
         bool isTargetIdPresent,
         byte uiKey)
     {
         Balance = balance;
         AccessGranted = accessGranted;
         ShipDeedTitle = shipDeedTitle;
+        ShipSellValue = shipSellValue;
+        ShipSellTax = shipSellTax;
         IsTargetIdPresent = isTargetIdPresent;
         UiKey = uiKey;
     }
diff --git a/Resources/Locale/en-US/cargo/cargo-console-component.ftl b/Resources/Locale/en-US/cargo/cargo-console-component.ftl
index f66a0986556..ed6a130f49b 100644
--- a/Resources/Locale/en-US/cargo/cargo-console-component.ftl
+++ b/Resources/Locale/en-US/cargo/cargo-console-component.ftl
@@ -42,6 +42,8 @@ cargo-shuttle-console-menu-title = Cargo shuttle console
 cargo-shuttle-console-station-unknown = Unknown
 cargo-shuttle-console-shuttle-not-found = Not found
 cargo-shuttle-console-organics = Detected organic lifeforms on the shuttle
+cargo-shuttle-console-bank-amount = Bank spesos:${$amount}
+cargo-shuttle-console-sell-value = Shuttle value:${$value}
 cargo-no-shuttle = No cargo shuttle found!
 
 cargo-telepad-delay-upgrade = Teleport delay

From b9969e2027bd66dd3d1ff3e37f66118a01a2614c Mon Sep 17 00:00:00 2001
From: Dvir <dvirf01@gmail.com>
Date: Sun, 15 Oct 2023 03:49:13 +0300
Subject: [PATCH 2/4] Sell Price

---
 .../Shipyard/UI/ShipyardConsoleMenu.xaml.cs   |  6 ---
 .../Systems/ShipyardSystem.Consoles.cs        | 43 ++++++++++---------
 .../BUI/ShipyardConsoleInterfaceState.cs      |  3 --
 .../en-US/cargo/cargo-console-component.ftl   |  2 +-
 4 files changed, 24 insertions(+), 30 deletions(-)

diff --git a/Content.Client/Shipyard/UI/ShipyardConsoleMenu.xaml.cs b/Content.Client/Shipyard/UI/ShipyardConsoleMenu.xaml.cs
index bb1dd8c68ea..723dc48eac2 100644
--- a/Content.Client/Shipyard/UI/ShipyardConsoleMenu.xaml.cs
+++ b/Content.Client/Shipyard/UI/ShipyardConsoleMenu.xaml.cs
@@ -134,12 +134,6 @@ public void PopulateCategories()
 
     public void UpdateState(ShipyardConsoleInterfaceState state)
     {
-        if (state.ShipSellTax != 0.0f)
-        {
-            var tax = (int) (state.ShipSellValue * state.ShipSellTax);
-            state.ShipSellValue -= tax;
-        }
-
         BankAccountLabel.Text = Loc.GetString("cargo-shuttle-console-bank-amount", ("amount", state.Balance.ToString()));
         ShipSellValueLabel.Text = Loc.GetString("cargo-shuttle-console-sell-value", ("value", state.ShipSellValue.ToString()));
         SellShipButton.Disabled = state.ShipDeedTitle == null;
diff --git a/Content.Server/Shipyard/Systems/ShipyardSystem.Consoles.cs b/Content.Server/Shipyard/Systems/ShipyardSystem.Consoles.cs
index 2eaafb563c3..be2cb5ca363 100644
--- a/Content.Server/Shipyard/Systems/ShipyardSystem.Consoles.cs
+++ b/Content.Server/Shipyard/Systems/ShipyardSystem.Consoles.cs
@@ -186,17 +186,19 @@ private void OnPurchaseMessage(EntityUid uid, ShipyardConsoleComponent component
             _records.Synchronize(station);
         }
 
-        float shipSellTax = 0.0f;
-        if (ShipyardConsoleUiKey.BlackMarket == (ShipyardConsoleUiKey) args.UiKey)
-            shipSellTax = 0.30f;
-
         int sellValue = 0;
         if (TryComp<ShuttleDeedComponent>(targetId, out var deed))
             sellValue = (int) _pricing.AppraiseGrid((EntityUid) (deed?.ShuttleUid!));
 
+        if (ShipyardConsoleUiKey.BlackMarket == (ShipyardConsoleUiKey) args.UiKey)
+        {
+            var tax = (int) (sellValue * 0.30f);
+            sellValue -= tax;
+        }
+
         PlayConfirmSound(uid, component);
         _adminLogger.Add(LogType.ShipYardUsage, LogImpact.Low, $"{ToPrettyString(player):actor} purchased shuttle {ToPrettyString(shuttle.Owner)} for {vessel.Price} credits via {ToPrettyString(component.Owner)}");
-        RefreshState(uid, bank.Balance, true, name, sellValue, shipSellTax, true, (ShipyardConsoleUiKey) args.UiKey);
+        RefreshState(uid, bank.Balance, true, name, sellValue, true, (ShipyardConsoleUiKey) args.UiKey);
     }
 
     public void OnSellMessage(EntityUid uid, ShipyardConsoleComponent component, ShipyardConsoleSellMessage args)
@@ -264,7 +266,6 @@ public void OnSellMessage(EntityUid uid, ShipyardConsoleComponent component, Shi
 
         RemComp<ShuttleDeedComponent>(targetId);
 
-        float shipSellTax = 0.0f;
         if (ShipyardConsoleUiKey.BlackMarket == (ShipyardConsoleUiKey) args.UiKey)
         {
             var tax = (int) (bill * 0.30f);
@@ -276,13 +277,12 @@ public void OnSellMessage(EntityUid uid, ShipyardConsoleComponent component, Shi
             }
 
             bill -= tax;
-            shipSellTax = 0.30f;
         }
 
         _bank.TryBankDeposit(player, bill);
         PlayConfirmSound(uid, component);
         _adminLogger.Add(LogType.ShipYardUsage, LogImpact.Low, $"{ToPrettyString(player):actor} sold {shuttleName} for {bill} credits via {ToPrettyString(component.Owner)}");
-        RefreshState(uid, bank.Balance, true, null, 0, shipSellTax, true, (ShipyardConsoleUiKey) args.UiKey);
+        RefreshState(uid, bank.Balance, true, null, 0, true, (ShipyardConsoleUiKey) args.UiKey);
     }
 
     private void OnConsoleUIOpened(EntityUid uid, ShipyardConsoleComponent component, BoundUIOpenedEvent args)
@@ -300,16 +300,18 @@ private void OnConsoleUIOpened(EntityUid uid, ShipyardConsoleComponent component
             return;
         }
 
-        float shipSellTax = 0.0f;
-        if (ShipyardConsoleUiKey.BlackMarket == (ShipyardConsoleUiKey) args.UiKey)
-            shipSellTax = 0.30f;
-
         var targetId = component.TargetIdSlot.ContainerSlot?.ContainedEntity;
         int sellValue = 0;
         if (TryComp<ShuttleDeedComponent>(targetId, out var deed))
             sellValue = (int) _pricing.AppraiseGrid((EntityUid) (deed?.ShuttleUid!));
 
-        RefreshState(uid, bank.Balance, true, deed?.ShuttleName, sellValue, shipSellTax, targetId.HasValue, (ShipyardConsoleUiKey) args.UiKey);
+        if (ShipyardConsoleUiKey.BlackMarket == (ShipyardConsoleUiKey) args.UiKey)
+        {
+            var tax = (int) (sellValue * 0.30f);
+            sellValue -= tax;
+        }
+
+        RefreshState(uid, bank.Balance, true, deed?.ShuttleName, sellValue, targetId.HasValue, (ShipyardConsoleUiKey) args.UiKey);
     }
 
     private void ConsolePopup(ICommonSession session, string text)
@@ -348,16 +350,18 @@ private void OnItemSlotChanged(EntityUid uid, ShipyardConsoleComponent component
             return;
         }
 
-        float shipSellTax = 0.0f;
-        if (ShipyardConsoleUiKey.BlackMarket == (ShipyardConsoleUiKey) uiComp.Key)
-            shipSellTax = 0.30f;
-
         var targetId = component.TargetIdSlot.ContainerSlot?.ContainedEntity;
         int sellValue = 0;
         if (TryComp<ShuttleDeedComponent>(targetId, out var deed))
             sellValue = (int) _pricing.AppraiseGrid((EntityUid) (deed?.ShuttleUid!));
 
-        RefreshState(uid, bank.Balance, true, deed?.ShuttleName, sellValue, shipSellTax, targetId.HasValue, (ShipyardConsoleUiKey) uiComp.Key);
+        if (ShipyardConsoleUiKey.BlackMarket == (ShipyardConsoleUiKey) uiComp.Key)
+        {
+            var tax = (int) (sellValue * 0.30f);
+            sellValue -= tax;
+        }
+
+        RefreshState(uid, bank.Balance, true, deed?.ShuttleName, sellValue, targetId.HasValue, (ShipyardConsoleUiKey) uiComp.Key);
     }
 
     public bool FoundOrganics(EntityUid uid, EntityQuery<MobStateComponent> mobQuery, EntityQuery<TransformComponent> xformQuery)
@@ -374,14 +378,13 @@ public bool FoundOrganics(EntityUid uid, EntityQuery<MobStateComponent> mobQuery
         return false;
     }
 
-    private void RefreshState(EntityUid uid, int balance, bool access, string? shipDeed, int shipSellValue, float shipSellTax, bool isTargetIdPresent, ShipyardConsoleUiKey uiKey)
+    private void RefreshState(EntityUid uid, int balance, bool access, string? shipDeed, int shipSellValue, bool isTargetIdPresent, ShipyardConsoleUiKey uiKey)
     {
         var newState = new ShipyardConsoleInterfaceState(
             balance,
             access,
             shipDeed,
             shipSellValue,
-            shipSellTax,
             isTargetIdPresent,
             ((byte)uiKey));
 
diff --git a/Content.Shared/Shipyard/BUI/ShipyardConsoleInterfaceState.cs b/Content.Shared/Shipyard/BUI/ShipyardConsoleInterfaceState.cs
index ec251822fd1..95fcac3f857 100644
--- a/Content.Shared/Shipyard/BUI/ShipyardConsoleInterfaceState.cs
+++ b/Content.Shared/Shipyard/BUI/ShipyardConsoleInterfaceState.cs
@@ -9,7 +9,6 @@ public sealed class ShipyardConsoleInterfaceState : BoundUserInterfaceState
     public readonly bool AccessGranted;
     public readonly string? ShipDeedTitle;
     public int ShipSellValue;
-    public float ShipSellTax;
     public readonly bool IsTargetIdPresent;
     public readonly byte UiKey;
 
@@ -18,7 +17,6 @@ public ShipyardConsoleInterfaceState(
         bool accessGranted,
         string? shipDeedTitle,
         int shipSellValue,
-        float shipSellTax,
         bool isTargetIdPresent,
         byte uiKey)
     {
@@ -26,7 +24,6 @@ public ShipyardConsoleInterfaceState(
         AccessGranted = accessGranted;
         ShipDeedTitle = shipDeedTitle;
         ShipSellValue = shipSellValue;
-        ShipSellTax = shipSellTax;
         IsTargetIdPresent = isTargetIdPresent;
         UiKey = uiKey;
     }
diff --git a/Resources/Locale/en-US/cargo/cargo-console-component.ftl b/Resources/Locale/en-US/cargo/cargo-console-component.ftl
index ed6a130f49b..b2fddc18947 100644
--- a/Resources/Locale/en-US/cargo/cargo-console-component.ftl
+++ b/Resources/Locale/en-US/cargo/cargo-console-component.ftl
@@ -43,7 +43,7 @@ cargo-shuttle-console-station-unknown = Unknown
 cargo-shuttle-console-shuttle-not-found = Not found
 cargo-shuttle-console-organics = Detected organic lifeforms on the shuttle
 cargo-shuttle-console-bank-amount = Bank spesos:${$amount}
-cargo-shuttle-console-sell-value = Shuttle value:${$value}
+cargo-shuttle-console-sell-value = Shuttle estimate value:${$value}
 cargo-no-shuttle = No cargo shuttle found!
 
 cargo-telepad-delay-upgrade = Teleport delay

From c8eec3bdb3365f72dbdb13a2596cc65e85addd71 Mon Sep 17 00:00:00 2001
From: Dvir <dvirf01@gmail.com>
Date: Sun, 15 Oct 2023 03:52:58 +0300
Subject: [PATCH 3/4] Update ShipyardSystem.Consoles.cs

---
 Content.Server/Shipyard/Systems/ShipyardSystem.Consoles.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Content.Server/Shipyard/Systems/ShipyardSystem.Consoles.cs b/Content.Server/Shipyard/Systems/ShipyardSystem.Consoles.cs
index be2cb5ca363..c09a77d4f9f 100644
--- a/Content.Server/Shipyard/Systems/ShipyardSystem.Consoles.cs
+++ b/Content.Server/Shipyard/Systems/ShipyardSystem.Consoles.cs
@@ -26,8 +26,6 @@
 using Content.Server.Chat.Systems;
 using Content.Server.StationRecords.Systems;
 using Content.Shared.Database;
-using Content.Server.Shuttles.Components;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
 
 namespace Content.Server.Shipyard.Systems;
 

From 644dd48dee96cdc7b9eb1c0efdaf90be76af83ba Mon Sep 17 00:00:00 2001
From: Dvir <dvirf01@gmail.com>
Date: Sun, 15 Oct 2023 11:29:29 +0300
Subject: [PATCH 4/4] FTL

---
 Content.Client/Shipyard/UI/ShipyardConsoleMenu.xaml.cs       | 4 ++--
 Resources/Locale/en-US/_NF/cargo/cargo-console-component.ftl | 3 +++
 Resources/Locale/en-US/cargo/cargo-console-component.ftl     | 2 --
 3 files changed, 5 insertions(+), 4 deletions(-)
 create mode 100644 Resources/Locale/en-US/_NF/cargo/cargo-console-component.ftl

diff --git a/Content.Client/Shipyard/UI/ShipyardConsoleMenu.xaml.cs b/Content.Client/Shipyard/UI/ShipyardConsoleMenu.xaml.cs
index 723dc48eac2..28d189cd10a 100644
--- a/Content.Client/Shipyard/UI/ShipyardConsoleMenu.xaml.cs
+++ b/Content.Client/Shipyard/UI/ShipyardConsoleMenu.xaml.cs
@@ -134,8 +134,8 @@ public void PopulateCategories()
 
     public void UpdateState(ShipyardConsoleInterfaceState state)
     {
-        BankAccountLabel.Text = Loc.GetString("cargo-shuttle-console-bank-amount", ("amount", state.Balance.ToString()));
-        ShipSellValueLabel.Text = Loc.GetString("cargo-shuttle-console-sell-value", ("value", state.ShipSellValue.ToString()));
+        BankAccountLabel.Text = Loc.GetString("cargo-shipyard-console-bank-amount", ("amount", state.Balance.ToString()));
+        ShipSellValueLabel.Text = Loc.GetString("cargo-shipyard-console-sell-value", ("value", state.ShipSellValue.ToString()));
         SellShipButton.Disabled = state.ShipDeedTitle == null;
         TargetIdButton.Text = state.IsTargetIdPresent
             ? Loc.GetString("id-card-console-window-eject-button")
diff --git a/Resources/Locale/en-US/_NF/cargo/cargo-console-component.ftl b/Resources/Locale/en-US/_NF/cargo/cargo-console-component.ftl
new file mode 100644
index 00000000000..794771bedc4
--- /dev/null
+++ b/Resources/Locale/en-US/_NF/cargo/cargo-console-component.ftl
@@ -0,0 +1,3 @@
+# Cargo shipyard console
+cargo-shipyard-console-bank-amount = Bank spesos:${$amount}
+cargo-shipyard-console-sell-value = Shuttle estimated value:${$value}
diff --git a/Resources/Locale/en-US/cargo/cargo-console-component.ftl b/Resources/Locale/en-US/cargo/cargo-console-component.ftl
index b2fddc18947..f66a0986556 100644
--- a/Resources/Locale/en-US/cargo/cargo-console-component.ftl
+++ b/Resources/Locale/en-US/cargo/cargo-console-component.ftl
@@ -42,8 +42,6 @@ cargo-shuttle-console-menu-title = Cargo shuttle console
 cargo-shuttle-console-station-unknown = Unknown
 cargo-shuttle-console-shuttle-not-found = Not found
 cargo-shuttle-console-organics = Detected organic lifeforms on the shuttle
-cargo-shuttle-console-bank-amount = Bank spesos:${$amount}
-cargo-shuttle-console-sell-value = Shuttle estimate value:${$value}
 cargo-no-shuttle = No cargo shuttle found!
 
 cargo-telepad-delay-upgrade = Teleport delay