From 413f51d5f5eb12fdad9bffd9519fdea2aa061c06 Mon Sep 17 00:00:00 2001
From: rhailrake <49613070+rhailrake@users.noreply.github.com>
Date: Mon, 1 May 2023 17:11:53 +0600
Subject: [PATCH] [tweak] Shuttle Prikol

---
 .../Shuttles/Systems/ShuttleConsoleSystem.cs         | 12 +++++++++++-
 .../Entities/Structures/Doors/Airlocks/access.yml    | 10 ++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs b/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs
index 21c7ecc050..42fbb99636 100644
--- a/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs
+++ b/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs
@@ -6,6 +6,7 @@ using Content.Server.Station.Systems;
 using Content.Server.UserInterface;
 using Content.Shared.ActionBlocker;
 using Content.Shared.Alert;
+using Content.Shared.Cargo.Components;
 using Content.Shared.Popups;
 using Content.Shared.Shuttles.BUIStates;
 using Content.Shared.Shuttles.Components;
@@ -126,7 +127,16 @@ public sealed partial class ShuttleConsoleSystem : SharedShuttleConsoleSystem
         var ev = new ShuttleConsoleFTLTravelStartEvent(uid);
         RaiseLocalEvent(ref ev);
 
-        _shuttle.FTLTravel(xform.GridUid.Value, shuttle, destination, dock: dock, priorityTag: tagEv.Tag);
+        //WD-EDIT
+        if (HasComp<CargoShuttleComponent>(shuttleUid))
+        {
+            _shuttle.FTLTravel(xform.GridUid.Value, shuttle, destination, dock: dock, priorityTag: "DockCargo");
+        }
+        else
+        {
+            _shuttle.FTLTravel(xform.GridUid.Value, shuttle, destination, dock: dock, priorityTag: tagEv.Tag);
+        }
+        //WD-EDIT
     }
 
     private void OnDock(DockEvent ev)
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
index 72fa03cc6f..dbed2d0162 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
@@ -1004,6 +1004,16 @@
     - type: PriorityDock
       tag: DockArrivals
 
+- type: entity
+  parent: AirlockGlassShuttle
+  id: AirlockExternalGlassShuttleCargo
+  suffix: Cargo
+  components:
+    - type: PriorityDock
+      tag: DockCargo
+    - type: AccessReader
+      access: [ [ "Cargo" ] ]
+
 - type: entity
   parent: AirlockGlassShuttle
   id: AirlockExternalGlassShuttleEscape