new-frontiers-14 · Cheackraze · Nov 5, 2023 · Nov 4, 2023 · Nov 4, 2023 · Nov 4, 2023
diff --git a/Content.Server/Shipyard/Systems/ShipyardSystem.Consoles.cs b/Content.Server/Shipyard/Systems/ShipyardSystem.Consoles.cs
@@ -170,13 +170,11 @@ private void OnPurchaseMessage(EntityUid uid, ShipyardConsoleComponent component
         var channel = _prototypeManager.Index<RadioChannelPrototype>(component.ShipyardChannel);
         newDeed.ShuttleUid = shuttle.Owner;
         newDeed.ShuttleName = name;
+        newDeed.ShuttleOwner = 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);
-
         if (TryComp<StationRecordKeyStorageComponent>(targetId, out var keyStorage)
                 && shuttleStation !=null
                 && keyStorage.Key != null
@@ -201,6 +199,9 @@ private void OnPurchaseMessage(EntityUid uid, ShipyardConsoleComponent component
             sellValue -= tax;
         }
 
+        _radio.SendRadioMessage(uid, Loc.GetString("shipyard-console-docking", ("owner", player), ("vessel", name)), channel, uid);
+        _chat.TrySendInGameICMessage(uid, Loc.GetString("shipyard-console-docking", ("owner", player), ("vessel", name)), InGameICChatType.Speak, true);
+
         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, true, (ShipyardConsoleUiKey) args.UiKey);
@@ -262,6 +263,8 @@ public void OnSellMessage(EntityUid uid, ShipyardConsoleComponent component, Shi
 
         var shuttleName = ToPrettyString(shuttleUid); // Grab the name before it gets 1984'd
 
+        var channel = _prototypeManager.Index<RadioChannelPrototype>(component.ShipyardChannel);
+
         if (!TrySellShuttle(stationUid, shuttleUid, out var bill))
         {
             ConsolePopup(args.Session, Loc.GetString("shipyard-console-sale-reqs"));
@@ -286,6 +289,10 @@ public void OnSellMessage(EntityUid uid, ShipyardConsoleComponent component, Shi
 
         _bank.TryBankDeposit(player, bill);
         PlayConfirmSound(uid, component);
+
+        _radio.SendRadioMessage(uid, Loc.GetString("shipyard-console-leaving", ("owner", deed.ShuttleOwner!), ("vessel", deed.ShuttleName!), ("player", player)), channel, uid);
+        _chat.TrySendInGameICMessage(uid, Loc.GetString("shipyard-console-leaving", ("owner", deed.ShuttleOwner!), ("vessel", deed.ShuttleName!), ("player", player)), InGameICChatType.Speak, true);
+
         _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, true, (ShipyardConsoleUiKey) args.UiKey);
     }

diff --git a/Content.Shared/Shipyard/Components/SharedShipyardConsoleComponent.cs b/Content.Shared/Shipyard/Components/SharedShipyardConsoleComponent.cs
@@ -22,5 +22,5 @@ public sealed partial class ShipyardConsoleComponent : Component
         new SoundPathSpecifier("/Audio/Effects/Cargo/ping.ogg");
 
     [DataField("shipyardChannel")]
-    public string ShipyardChannel = "Command";
+    public string ShipyardChannel = "Traffic";
 }
diff --git a/Content.Shared/Shipyard/Components/ShuttleDeedComponent.cs b/Content.Shared/Shipyard/Components/ShuttleDeedComponent.cs
@@ -8,9 +8,12 @@ namespace Content.Shared.Shipyard.Components;
 [RegisterComponent, Access(typeof(SharedShipyardSystem))]
 public sealed partial class ShuttleDeedComponent : Component
 {
-    [DataField("shuttleuid")]
+    [DataField("shuttleUid")]
     public EntityUid? ShuttleUid;
 
-    [DataField("shuttlename")]
+    [DataField("shuttleName")]
     public string? ShuttleName;
+
+    [DataField("shuttleOwner")]
+    public EntityUid? ShuttleOwner;
 }
diff --git a/Resources/Locale/en-US/_NF/headset/headset-component.ftl b/Resources/Locale/en-US/_NF/headset/headset-component.ftl
@@ -0,0 +1 @@
+chat-radio-traffic = Traffic
diff --git a/Resources/Locale/en-US/headset/headset-component.ftl b/Resources/Locale/en-US/headset/headset-component.ftl
@@ -6,7 +6,7 @@ examine-headset-default-channel = Use {$prefix} for the default channel ([color=
 
 chat-radio-common = Common
 chat-radio-centcom = CentCom
-chat-radio-command = Traffic
+chat-radio-command = Command
 chat-radio-engineering = Engineering
 chat-radio-medical = Medical
 chat-radio-science = Science

diff --git a/Resources/Locale/en-US/shipyard/shipyard-console-component.ftl b/Resources/Locale/en-US/shipyard/shipyard-console-component.ftl
@@ -1,7 +1,8 @@
 ## UI
 shipyard-console-invalid-vessel = Cannot purchase vessel: 
 shipyard-console-menu-title = Shipyard Menu
-shipyard-console-docking = {$vessel} en route to the station, eta 60 seconds.
+shipyard-console-docking = Captain {$owner} shuttle {$vessel} en route, eta 10 seconds.
+shipyard-console-leaving = Captain {$owner} shuttle {$vessel} sold by {$player}.
 shipyard-commands-purchase-desc = Spawns and FTL docks a specified shuttle from a grid file.
 shipyard-console-no-idcard = No ID card present
 shipyard-console-already-deeded = ID card already has a Deed

diff --git a/Resources/Maps/Shuttles/anchor.yml b/Resources/Maps/Shuttles/anchor.yml
@@ -4941,18 +4941,6 @@ entities:
     - pos: -6.6491866,1.847079
       parent: 1
       type: Transform
-- proto: EncryptionKeyCommand
-  entities:
-  - uid: 711
-    components:
-    - pos: -0.7042618,6.6897984
-      parent: 1
-      type: Transform
-  - uid: 712
-    components:
-    - pos: 1.5215468,7.4941516
-      parent: 1
-      type: Transform
 - proto: ExtinguisherCabinet
   entities:
   - uid: 713

diff --git a/Resources/Maps/Shuttles/chisel.yml b/Resources/Maps/Shuttles/chisel.yml
@@ -1276,13 +1276,6 @@ entities:
     - pos: 3.3084455,2.5795195
       parent: 1
       type: Transform
-- proto: EncryptionKeyCommand
-  entities:
-  - uid: 146
-    components:
-    - pos: -5.4916778,4.0552964
-      parent: 1
-      type: Transform
 - proto: ExtinguisherCabinetFilled
   entities:
   - uid: 271

diff --git a/Resources/Maps/Shuttles/dart.yml b/Resources/Maps/Shuttles/dart.yml
@@ -3211,13 +3211,6 @@ entities:
     - enabled: True
       type: AmbientSound
     - type: ActiveEmergencyLight
-- proto: EncryptionKeyCommand
-  entities:
-  - uid: 982
-    components:
-    - pos: -4.7592955,5.4378777
-      parent: 1
-      type: Transform
 - proto: ExtinguisherCabinetFilled
   entities:
   - uid: 15

diff --git a/Resources/Maps/Shuttles/esquire.yml b/Resources/Maps/Shuttles/esquire.yml
@@ -1867,18 +1867,6 @@ entities:
     - pos: -2.7296505,7.590156
       parent: 1
       type: Transform
-- proto: EncryptionKeyCommand
-  entities:
-  - uid: 333
-    components:
-    - pos: -0.5524479,8.584573
-      parent: 1
-      type: Transform
-  - uid: 334
-    components:
-    - pos: 0.49755195,8.575198
-      parent: 1
-      type: Transform
 - proto: ExtinguisherCabinetFilled
   entities:
   - uid: 612

diff --git a/Resources/Maps/Shuttles/hospitaller.yml b/Resources/Maps/Shuttles/hospitaller.yml
@@ -475,13 +475,6 @@ entities:
     - pos: 1.5,-1.5
       parent: 1
       type: Transform
-- proto: EncryptionKeyCommand
-  entities:
-  - uid: 59
-    components:
-    - pos: 1.4846325,4.5628347
-      parent: 1
-      type: Transform
 - proto: FaxMachineShip
   entities:
   - uid: 60

diff --git a/Resources/Maps/Shuttles/marauder.yml b/Resources/Maps/Shuttles/marauder.yml
@@ -4081,18 +4081,6 @@ entities:
       pos: 4.5,18.5
       parent: 1
       type: Transform
-- proto: EncryptionKeyCommand
-  entities:
-  - uid: 614
-    components:
-    - pos: -0.46291542,19.523981
-      parent: 1
-      type: Transform
-  - uid: 615
-    components:
-    - pos: 1.5214596,19.477106
-      parent: 1
-      type: Transform
 - proto: EnergySword
   entities:
   - uid: 530

diff --git a/Resources/Maps/Shuttles/metastable.yml b/Resources/Maps/Shuttles/metastable.yml
@@ -4843,18 +4843,6 @@ entities:
     - canCollide: False
       type: Physics
     - type: InsideEntityStorage
-- proto: EncryptionKeyCommand
-  entities:
-  - uid: 1377
-    components:
-    - pos: 0.44179726,1.4648764
-      parent: 2
-      type: Transform
-  - uid: 1385
-    components:
-    - pos: -0.54257774,1.4492514
-      parent: 2
-      type: Transform
 - proto: EpinephrineChemistryBottle
   entities:
   - uid: 1242

diff --git a/Resources/Maps/Shuttles/pathfinder.yml b/Resources/Maps/Shuttles/pathfinder.yml
@@ -1522,13 +1522,6 @@ entities:
     - pos: 10.542477,-6.408145
       parent: 1
       type: Transform
-- proto: EncryptionKeyCommand
-  entities:
-  - uid: 489
-    components:
-    - pos: -2.4641337,1.5246706
-      parent: 1
-      type: Transform
 - proto: FaxMachineShip
   entities:
   - uid: 197