From ca58afd81b46c47565cd6dd6b81cd4878afc643f Mon Sep 17 00:00:00 2001
From: Acruid <shatter66@gmail.com>
Date: Sat, 11 Jan 2020 15:15:11 -0800
Subject: [PATCH] Added a Collidable Component to the existing station grind in
 StationStation.

---
 .../Components/Movement/ShuttleControllerComponent.cs         | 1 +
 Resources/Maps/stationstation.yml                             | 4 ++++
 RobustToolbox                                                 | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/Content.Server/GameObjects/Components/Movement/ShuttleControllerComponent.cs b/Content.Server/GameObjects/Components/Movement/ShuttleControllerComponent.cs
index 088af80ecb..aa066e4732 100644
--- a/Content.Server/GameObjects/Components/Movement/ShuttleControllerComponent.cs
+++ b/Content.Server/GameObjects/Components/Movement/ShuttleControllerComponent.cs
@@ -52,6 +52,7 @@ namespace Content.Server.GameObjects.Components.Movement
                     physComp.Mass = 1;
                 }
 
+                //TODO: Is this always true?
                 if (!gridEntity.HasComponent<ICollidableComponent>())
                 {
                     var collideComp = gridEntity.AddComponent<CollidableComponent>();
diff --git a/Resources/Maps/stationstation.yml b/Resources/Maps/stationstation.yml
index cd9c5d226a..7f2bf0ab29 100644
--- a/Resources/Maps/stationstation.yml
+++ b/Resources/Maps/stationstation.yml
@@ -101,6 +101,10 @@ entities:
     type: Transform
   - index: 0
     type: MapGrid
+  - shapes:
+    - !type:PhysShapeGrid
+      grid: 0
+    type: Collidable
 - uid: 1
   type: LaserItem
   components:
diff --git a/RobustToolbox b/RobustToolbox
index 78a33076f9..30db86fae8 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit 78a33076f9f0f77b165dcfdea22f5cda4633dc2b
+Subproject commit 30db86fae86ebd575b7a7458ee3c11681a12fa49