diff --git a/Resources/Prototypes/GameRules/SP14/unknown_shuttles.yml b/Resources/Prototypes/GameRules/SP14/unknown_shuttles.yml
index 8860cc6df5..7b5d821636 100644
--- a/Resources/Prototypes/GameRules/SP14/unknown_shuttles.yml
+++ b/Resources/Prototypes/GameRules/SP14/unknown_shuttles.yml
@@ -1,5 +1,5 @@
 - type: entityTable
-  id: UnknownShuttlesFreelanceTable
+  id: UnknownShuttlesSP14FreelanceTable
   table: !type:AllSelector # we need to pass a list of rules, since rules have further restrictions to consider via StationEventComp
     children:
     - id: UnknownShuttleSP14Transfer
diff --git a/Resources/Prototypes/GameRules/roundstart.yml b/Resources/Prototypes/GameRules/roundstart.yml
index 6ca322d0d5..2180bdf426 100644
--- a/Resources/Prototypes/GameRules/roundstart.yml
+++ b/Resources/Prototypes/GameRules/roundstart.yml
@@ -291,11 +291,7 @@
   table: !type:AllSelector # we need to pass a list of rules, since rules have further restrictions to consider via StationEventComp
     children:
       - !type:NestedSelector
-        tableId: UnknownShuttlesFriendlyTable
-      - !type:NestedSelector
-        tableId: UnknownShuttlesFreelanceTable
-      - !type:NestedSelector
-        tableId: UnknownShuttlesHostileTable
+        tableId: UnknownShuttlesSP14FreelanceTable
 
 - type: entity
   id: BasicStationEventScheduler
diff --git a/RobustToolbox b/RobustToolbox
index 92b0e7f1a8..2178707937 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit 92b0e7f1a853979a1361ed24d2fb5ffc11f43f66
+Subproject commit 217870793771c008327fe0a7d3be965b2f4880c3