diff --git a/Resources/Prototypes/SS220/Entities/Objects/Devices/Circuitboards/computer.yml b/Resources/Prototypes/SS220/Entities/Objects/Devices/Circuitboards/computer.yml
index 8d56f9dfc1f9e2..9164e42a92fabc 100644
--- a/Resources/Prototypes/SS220/Entities/Objects/Devices/Circuitboards/computer.yml
+++ b/Resources/Prototypes/SS220/Entities/Objects/Devices/Circuitboards/computer.yml
@@ -8,3 +8,15 @@
       state: cpu_command
     - type: ComputerBoard
       prototype: CentcomComputerComms
+
+#SALVAGE SHUTTLE RETURN
+- type: entity
+  parent: BaseComputerCircuitboard
+  id: SalvageShuttleConsoleCircuitboard
+  name: salvage shuttle console board
+  description: A computer printed circuit board for a salvage shuttle console.
+  components:
+    - type: ComputerBoard
+      prototype: ComputerShuttleSalvage
+    - type: StealTarget
+      stealGroup: SalvageShuttleConsoleCircuitboard
\ No newline at end of file
diff --git a/Resources/Prototypes/SS220/Entities/Structures/Machines/computers.yml b/Resources/Prototypes/SS220/Entities/Structures/Machines/computers.yml
index 79bbdc2a067466..2d11ea59f8ea53 100644
--- a/Resources/Prototypes/SS220/Entities/Structures/Machines/computers.yml
+++ b/Resources/Prototypes/SS220/Entities/Structures/Machines/computers.yml
@@ -38,4 +38,35 @@
   suffix: LoneOps
   components:
   - type: CommunicationsConsole
-    title: comms-console-announcement-title-solo-nukie
\ No newline at end of file
+    title: comms-console-announcement-title-solo-nukie
+
+#SALVAGE SHUTTLE RETURN
+- type: entity
+  parent: BaseComputerShuttle
+  id: ComputerShuttleSalvage
+  name: salvage shuttle console
+  description: Used to pilot the salvage shuttle.
+  components:
+    - type: Sprite
+      layers:
+        - map: ["computerLayerBody"]
+          state: computer
+        - map: ["computerLayerKeyboard"]
+          state: generic_keyboard
+        - map: ["computerLayerScreen"]
+          state: shuttle
+        - map: ["computerLayerKeys"]
+          state: generic_keys
+    - type: DroneConsole
+      components:
+        - type: SalvageShuttle
+    - type: RadarConsole
+      maxRange: 256
+    - type: PointLight
+      radius: 1.5
+      energy: 1.6
+      color: "#43ccb5"
+    - type: Computer
+      board: SalvageShuttleConsoleCircuitboard
+    - type: StealTarget
+      stealGroup: SalvageShuttleConsoleCircuitboard
\ No newline at end of file
diff --git a/Resources/Prototypes/SS220/Objectives/stealTargetGroups.yml b/Resources/Prototypes/SS220/Objectives/stealTargetGroups.yml
index 6ad456102bb32c..6ed90299f9922e 100644
--- a/Resources/Prototypes/SS220/Objectives/stealTargetGroups.yml
+++ b/Resources/Prototypes/SS220/Objectives/stealTargetGroups.yml
@@ -18,3 +18,11 @@
   sprite:
     sprite: SS220/Objects/Weapons/Guns/multiphase_energy_gun.rsi
     state: icon
+
+#SALVAGE SHUTTLE RETURN
+- type: stealTargetGroup
+  id: SalvageShuttleConsoleCircuitboard
+  name: salvage shuttle console board
+  sprite:
+    sprite: Objects/Misc/module.rsi
+    state: cpuboard
\ No newline at end of file
diff --git a/Resources/Prototypes/SS220/Objectives/thief.yml b/Resources/Prototypes/SS220/Objectives/thief.yml
index cce99b29ad3d1d..780c51cdc50257 100644
--- a/Resources/Prototypes/SS220/Objectives/thief.yml
+++ b/Resources/Prototypes/SS220/Objectives/thief.yml
@@ -8,3 +8,15 @@
     stealGroup: VehicleSecway
   - type: Objective
     difficulty: 1
+
+#SALVAGE SHUTTLE RETURN
+- type: entity
+  parent: BaseThiefStealObjective
+  id: SalvageShuttleCircuitboardStealObjective
+  components:
+  - type: NotJobRequirement
+    job: SalvageSpecialist
+  - type: StealCondition
+    stealGroup: SalvageShuttleConsoleCircuitboard
+  - type: Objective
+    difficulty: 0.7
\ No newline at end of file
diff --git a/Resources/migration.yml b/Resources/migration.yml
index 15daced0bce295..7925a58df4b3ad 100644
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -473,9 +473,9 @@ ClothingBeltSuspenders: ClothingBeltSuspendersRed
 ClothingNeckShockCollar: ClothingBackpackElectropack
 
 # 2024-08-22
-ComputerShuttleSalvage: null
-SalvageShuttleConsoleCircuitboard: null
-SalvageShuttleCircuitboardStealObjective: null
+# ComputerShuttleSalvage: null # SS220 Revert SalvageShuttle
+# SalvageShuttleConsoleCircuitboard: null # SS220 Revert SalvageShuttle
+# SalvageShuttleCircuitboardStealObjective: null # SS220 Revert SalvageShuttle
 
 # 2024-08-28
 ClothingBackpackDuffelSyndicateCostumeCentcom: null
@@ -488,4 +488,4 @@ AntimovCircuitBoard: null
 OverlordCircuitBoard: null
 
 # 2024-09-07 SS220-upstream-merge
-Wristwatch: null
\ No newline at end of file
+Wristwatch: null